Merge "Switch to HexEncoding from ByteStringUtils"
am: 46a93ae8f8

Change-Id: Iabd1b701d3c3f44b50642d25eb3f2960eaebc48d