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

Change-Id: Ic38879fc39fda8ce84032d520f83608e10ea2dd9