Merge "Fix issue for DnsResolver#query" into qt-dev
am: 23d7a55d18

Change-Id: I572d498fcbaf6df44a91a5b77552e497bc9f5cb7