Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev