Merge commit \'210648c40e7c2001cc2a52df532a6ae8f89ac029\' into mnc-dr2-dev-plus-aosp
am: 516d8d99f2

* commit '516d8d99f226a848a56578215f6025b6fa33bae1':
  Fix benign integer overflow in printHexDump