Merge "Switch to HexEncoding from ByteStringUtils" am: 70f7a0bf04 am: 0cb55a64c4
am: 5948b83b0b

Change-Id: I659eaff98c3ae024cbbc4b12340ca718063bbf61