Merge "Switch to HexEncoding from ByteStringUtils"
am: 6badf7c7da

Change-Id: I0af52cb2289e1df89ac65fa01334d4e9de69e010