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

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