Merge "Code cleanup for HexEncoding" am: 08593623de
am: 3b8b203623

Change-Id: I15e4ddbe3f0f5ab12c63db20cd1784537cd0ec11