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

Change-Id: Ifc776c67025925fbeb2c13038ae78061c32567f5