Merge "Updating mock for ConnectivityService"