Merge "Fix one of the breakages of ConnectivityServiceTest in master."