Merge "Minor change for async DNS API"
am: 80be1b1127

Change-Id: I54a7695484b6523a92eaf246a4bb836fabc8957f
tree: 1974f3dd4733b292d38d300ea0a97d44b4a297b4
  1. core/
  2. services/
  3. tests/