Merge "Add basic resolution of Private DNS hostname" am: a3bf36f050 am: 4218c522a7
am: 0b250b6132

Change-Id: Iacdad88b49aff3e34afc93acfb8d3eeca9745c43