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