Merge "Switch from Byte.toHexString() to HexEncoding"