Merge "Allow CM/WIFI tests running with wifi-only flag."