Merge "Metrics logging for DNS queries." into nyc-dev