[automerger skipped] Merge "Actually resolve all IPs for Private DNS hostname" into pi-dev
am: dd08f4b96a  -s ours

Change-Id: Id8753d01a14d062baaeb313437b15f03161d1477