Merge "Fix issue for DnsResolver#query"