Merge "Following commit for asynchronous DNS query API" am: 03fbb681c8
am: bc96369bc2

Change-Id: I15b156ebc079be6c95bbce53e2a49886b78449c5