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

Change-Id: I633a592c7f46162268a759f84a77211443e9a04e