Merge "Remove "when" usage in ConnectivityServiceTest"