Merge "Actually resolve all IPs for Private DNS hostname" into pi-dev