Merge "Fix a bug where private DNS to v4-only servers don't validate." am: b8467591 am: 5f7aee00 am: 4b5f3a31 Change-Id: I1bbbe225935a1267d6f6d17b1651392d8be3bd87