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

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