Merge "Move some utility methods to MdnsUtils"