Merge "Switch to HexEncoding from ByteStringUtils"
am: 32fed1231a

Change-Id: I19de22143f45a1eb1fb74bc6c847f191bffaf7b5