Merge "Revert "Revert "Consolidate byte to/from hex methods to use HexEncoding."""