Merge "Use async dns query to resolve all addresses"
am: a956364754

Change-Id: Ib1af96b8f4ba2d1bc0605b5c8c4e63a065f953ba