Merge "No-op cleanup of ConnectivityService."