Merge "Address ConnectivityManager API comments."