Merge "Fix test3GToWifiNotification for mobile state validation."