Merge "Fix benign integer overflow in printHexDump" am: b36c7d0b6e am: dd2ead5220
am: cfde9e1de2

* commit 'cfde9e1de27372f2df26fa703019b8d156629cc3':
  Fix benign integer overflow in printHexDump