Merge "[automerger skipped] Merge "Switch to HexEncoding from ByteStringUtils"...
Merge "[automerger skipped] Merge "Switch to HexEncoding from ByteStringUtils" am: 46a93ae8 am: 50a1a19f -s ours
am: 816302d1 -s ours
am skip reason: change_id I07983ca596443a3e00616b63355c6504376f3e7c with SHA1 3447fb45 is in history
Change-Id: I4c7770c4ceaa510d5210725dd66076c449d52679