Merge "Fix ConnectivityServiceTest testRequestBenchmark"