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

* commit '633b35b4dcadc772fae5bc35404db965b18d370f':
  Prevent integer overflow when calculating buffer resizes