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

Change-Id: I874b39c9c76b13579f94b047a269e47602bda72d