Merge "Merge "Only actually log the DNS events we have." into nyc-dev am:...
Merge "Merge "Only actually log the DNS events we have." into nyc-dev am: cb988096 am: d755f9b8" into nyc-mr1-dev-plus-aosp
am: d306fda1
* commit 'd306fda1':
Change-Id: I00b19e1102a73a1ff854cb34f2f0fe0d7cde0f45