Merge "Reduce wasted buffer allocations" into mnc-dev