Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity" am: 9e3297a0 am: d593ac0f am: 801be56a Change-Id: I80399f9980119342ba5cd3d4f1922badb1fee3e9