Merge "Modify DnsUtils to use uppercase DNS label conversion" into main