Merge "Switch to HexEncoding from ByteStringUtils am: 65c26fc436 am: bf274046c0"