Merge "Merge "Only actually log the DNS events we have." into nyc-dev am: cb98809657 am: d755f9b86b" into nyc-mr1-dev-plus-aosp