Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1