[automerger skipped] Merge "Switch to HexEncoding from ByteStringUtils" am:...
[automerger skipped] Merge "Switch to HexEncoding from ByteStringUtils" am: a326166e am: 364ed0b1 -s ours
am: 9c50fd8c -s ours
am skip reason: change_id I2cb09da5ec5296799e03bab812b7fb29452a623e with SHA1 c3dfd089 is in history
Change-Id: I081d7ccdb7150b829f5aa95327671ab42d3d9ce2