am 9dad026b: am 574aed90: Merge "When aggregating buffers, make sure we don\'t...
am 9dad026b: am 574aed90: Merge "When aggregating buffers, make sure we don\'t lose data" into lmp-mr1-dev
automerge: 7ac1df38
* commit '7ac1df38':
When aggregating buffers, make sure we don't lose data