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

Change-Id: I80399f9980119342ba5cd3d4f1922badb1fee3e9
tree: 550ff53330b869cdf0e085c54e9b8c35952ab473
  1. core/
  2. services/
  3. tests/