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

Change-Id: I4fce0cbdebc301cd06253e23716107dcd3c869f9