Merge "Revert "Update to use new ConnectivityManager API.""