Merge "Test for asynchronous DNS query API" am: 6357dee73d am: 139a38c766
am: 135c14b24f

Change-Id: I1ba80f774630378daa1a7cb7323bdbcafb619c81