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

Change-Id: I2b7e184d9b9800a83b55dceb73af69085668748c