DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark am: cbf8ff83a8  -s ours am: 0bef352535  -s ours am: 6d756fa472
am: a45626b879  -s ours

Change-Id: I7bc91eaae2261bd152f3e9bb41c7ee70917a5d48