Merge "Switch from Byte.toHexString() to HexEncoding"
am: 1839e895f6

Change-Id: I9f4eb341877e4ddaa57824cbb24b53b1cd0a9b63