Merge "Clear local test results across DNS lookups." into nyc-dev