Merge "Fix race condition caused by fd reused for DnsResolver" am: 3f2aa4190d am: f8a2c15ca1
am: cc949037c3

Change-Id: I6268edd2b0f98694de7c55f8c6fac844cd5f8635