Merge "Wait for validation of WiFi in OEM pref test"