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

Change-Id: I4e10bfaa43a63cedd9fbddfc6f8bf8853c426eba
tree: f44741f321ff373fbccc7a5f57eef91a43e1a74c
  1. core/
  2. services/
  3. tests/