Merge "Switch to HexEncoding from ByteStringUtils"