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

Change-Id: I93e0d4a8664a16f2814763346ff00e6c874efd02