Switch to HexEncoding from ByteStringUtils am: ca48dd8182
am: 62a6b78b79

Change-Id: Ia01e8fdc3c332612d25e5d4484562e892e2aca77