Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity" am: 9e3297a099 am: d593ac0f90
am: 801be56a0f

Change-Id: I80399f9980119342ba5cd3d4f1922badb1fee3e9