Merge "Fix class name of WfEscapeShellArgTest"