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

Change-Id: Ie45d4c6337178d8912d2f41dc9023d71c004b100