Merge "Fix flaky test - testPartialConnectivity" am: 3f275ca900 am: 6494f3c649 am: 73fc6b4aff
am: 292fd7358a

Change-Id: If0230281ae66caef11da31ddfa55a6cabebf756b