Merge "Minor changes for DnsUtils and its test"
am: 8c4ef95cbb

Change-Id: Id49e8f1289071ce7f97d72868907e0e3284d411e