[automerger skipped] Merge "Use async dns query to resolve all addresses" into...
[automerger skipped] Merge "Use async dns query to resolve all addresses" into qt-dev am: 0491e454 -s ours
am: d21036c5 -s ours
am skip reason: change_id I2b7e184d9b9800a83b55dceb73af69085668748c with SHA1 40c5295c is in history
Change-Id: Ie59aca1d82a51f8f97578ba795c289b443a778b5