Merge "Actually resolve all IPs for Private DNS hostname"
am: 5ace372bc2

Change-Id: I83ffc854b60f2beb0a9e4c8a107ce26b656c935e