[automerger skipped] Merge "Fix a bug where private DNS to v4-only servers...

[automerger skipped] Merge "Fix a bug where private DNS to v4-only servers don't validate." into qt-dev am: 036871beb8 -s ours
am: 72cfd0af95 -s ours
am skip reason: change_id I362d43ee6af318694a4038a257e1ebb3f577863c with SHA1 4b5f3a313c is in history

Change-Id: I481c4cf762558458e3d72aaec7569c5f1b3abdb8