am d12dc284: Merge "If an error occurs that prevents us from reallocating...
am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
* commit 'd12dc284':
If an error occurs that prevents us from reallocating buffers during a format change