Merge "Remove a comment from ConnectivityService"