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