Merge "Fix ConnectivityServiceTest fail."