Merge "Following commit for asynchronous DNS query API"