Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity"
am: 52feef4450

Change-Id: I0639d4ccd7c3211595ede82bce3daa87ae759e10
tree: 7b9fd87f02a887a557e3ea860d17b76fcbd63099
  1. core/
  2. services/
  3. tests/