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

Change-Id: Ia7922edb119c12f185684682fd4d097337125248