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

Change-Id: I7379d8223778d3f2df97d88c0d6f291df219c579