am 61dfe1a6: am d2d16b93: Merge "We don\'t support mid-stream format changes" into mnc-dev

* commit '61dfe1a6b85844397749362d7eda749f7c57ac4c':
  We don't support mid-stream format changes