Merge "Code cleanup for HexEncoding"
am: 08593623de

Change-Id: I00ce99beef3eb638c1f31b59f8a38440ad66289a