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

Change-Id: I4b0a70cbfdce8f43c07275ace151d3ab464da5a4