Merge "Fix race condition caused by fd reused for DnsResolver" am: 3f2aa419 am: f8a2c15c am: cc949037 am: 9699fb25 Change-Id: I443bb11b15845b079ee4370a7797e692e62fa3c8