Merge "Fix a bug where private DNS to v4-only servers don't validate."
am: b846759154

Change-Id: I6707708c859cd734c3acb4aaa676ecb810d64bfd