am 2560442a: Merge "Prevent integer overflow when calculating buffer resizes" into mnc-dev

* commit '2560442a1ed7e21b9d941218d2e9e203626fa731':
  Prevent integer overflow when calculating buffer resizes