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

Change-Id: I92e3730002c11f3c2d5ea9c324f61237190f44bc