Merge "When aggregating buffers, make sure we don't lose data" into lmp-mr1-dev