Merge "Fix cancellation race problem for aysnc DNS API" am: 1859ae7e7d am: 391b3aa532
am: 2cc1be3b5a

Change-Id: I4e10bfaa43a63cedd9fbddfc6f8bf8853c426eba