Merge "Fix race condition caused by fd reused for DnsResolver" am: 7c98ae7d01
am: f8a2c15ca1

Change-Id: I93e0d4a8664a16f2814763346ff00e6c874efd02
tree: 64b2c16fd5ea0945f637180be6f2af4c62b8e600
  1. core/
  2. services/
  3. tests/