Merge "Improve cancellation test for async DNS API" am: 7ac8a1e73e
am: 532f7a7875

Change-Id: I495232e8e098ff59b1ffd268a1c0642ec5313e94