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

Change-Id: I4b0a70cbfdce8f43c07275ace151d3ab464da5a4