Merge "Fix cancellation race problem for aysnc DNS API" am: de6217b8e2
am: 829e409827

Change-Id: I633a592c7f46162268a759f84a77211443e9a04e
tree: 9f4fcab5bf5395a40e83b9342a16384a6b9b1a05
  1. core/
  2. services/
  3. tests/