Merge "Fix flaky test - testPartialConnectivity"
am: 3f275ca900

Change-Id: Ic643ec7a5641b531befc8a9c4af524177f97e761