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

Change-Id: I4235bc0fb0e330fb376c142fa02107c8b7d701ea