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

Change-Id: I9ce3476d80b05c140a02aaf1c21d4da2a68a8909