Merge "Prevent integer overflow when calculating buffer resizes" into mnc-dev