Merge "Fix WmTests presubmit failure"