Merge "Tighten checks for no dns queries in localhost tests"