Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity"