Merge changes from topic "am-79da5bca-0ca6-42a8-8b95-7ab98d864152" into nyc-mr1-dev

* changes:
  [automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a323 am: d04d54f843
  [automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a323
  MediaExtractor: stop rendering when an error occurs