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

Change-Id: If78cfc7351a20258089aa7d13b79441796937f7b