Merge "Fix the test flake on ConnectivityServiceTest"