DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark am: d0f492a893 -s ours am: 0bef352535 -s ours
am: 5ace8e7dca
Change-Id: I7379d8223778d3f2df97d88c0d6f291df219c579
This commit is contained in: