Merge "Use the new isNetworkSupported api for wifi-only"