Switch to HexEncoding from ByteStringUtils
am: ca48dd8182

Change-Id: I45d2e1f4a4a3f9a6fedf39aa87fa77f1b856f5e8