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

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