[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: 036871be -s ours am: 72cfd0af -s ours
am: dab9561d -s ours
am skip reason: change_id I362d43ee6af318694a4038a257e1ebb3f577863c with SHA1 4b5f3a31 is in history

Change-Id: Ife40877f88ff90b10504fd20bf8c57d8b356de42