Merge "Minor changes for DnsUtils and its test"