Merge "Fix flakes in tests running after testIsPrivateDnsBroken"