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

Change-Id: I940cca86b6214ea48d79575c64c9b11680597aa6