Merge "Update to use new ConnectivityManager API."