Merge "Replace hidden CM#isNetworkSupported() usage"