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