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

Change-Id: I1e5de255c4ee11f46dc8a1e3f5eaca2f2be1c792