Merge "Switch to HexEncoding from ByteStringUtils"
am: b4cc036c1e

Change-Id: Ie8fc4305f67071242140a1d066ae1c8993820923