Merge "Get ConnectivityServiceTest building again after 8f80cc8."