Merge "Fixed a bug with app provided media spans" into oc-mr1-dev am: 3c47a11598
am: 09adc8f1a3

Change-Id: Iefd242f4b242ae0861f7f1fd9b8b8b89b06d6f20