Merge "Metrics logging for DNS queries." into nyc-dev
am: 46dc79ce

* commit '46dc79cecf2daf1a0e1ec392c56fcb4f7c7a8eaf':
  Metrics logging for DNS queries.

Change-Id: Ie8882a735591a28af490478a479cc60d2e853fde