Merge "Fix cancellation race problem for aysnc DNS API"
am: b08fbde438

Change-Id: I7e22c38c502fa0181e97057d9992c2a43c11b378