Merge "Following commit for asynchronous DNS query API" am: a89f04a742
am: b010078e40

Change-Id: Ibf8d6ed7ff28ead8b9b7eb51db85ae8b9487066b