Merge "Code cleanup for HexEncoding"