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

Change-Id: I443bb11b15845b079ee4370a7797e692e62fa3c8