Merge "Switch to HexEncoding from ByteStringUtils"
am: 70f7a0bf04

Change-Id: I36db54949275402b7f25d8e2a1ea2ed6558a44d2