Merge "We don't support mid-stream format changes" into mnc-dev