Merge "Test for asynchronous DNS query API" am: 6357dee73d
am: 201ef3ffbe

Change-Id: I9e2ef04abe7b27ff3c4aee61f0597f6d95011837