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

Change-Id: Ia52675649a17f25f1baff9393f8a50b586893a56