[automerger skipped] Merge "Switch to HexEncoding from ByteStringUtils" am: b4cc036c1e am: 82248bfdd2 -s ours am: e2f20dbca1 -s ours
am: efd5943eb8 -s ours
am skip reason: change_id I6ee12e9914503a5b628ae6da82a396aa71dd972c with SHA1 e1d80fa415 is in history

Change-Id: Ie5a77d846e20e695cf4811daa980fd6cf8b335a2