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

Change-Id: I646cc1dd9a741296867cbb4b924e9a3d4714466e