Merge "Handle null pointer cases in ConnectivityService"