Merge "Fix flaky test - testPartialConnectivity"