[automerger skipped] Merge "Fix issue for DnsResolver#query" into qt-dev am:...
[automerger skipped] Merge "Fix issue for DnsResolver#query" into qt-dev am: 23d7a55d am: dd6b466b
am: 4cea0570 -s ours
am skip reason: change_id Ibb5080acd3c296650d56532fc7da525e9fa95e8f with SHA1 3854966d is in history
Change-Id: If5cd009ca06efbb0709c0397eb20bcae2823ede5