Merge "MediaCas: fixes for playback tests" into oc-dev
am: ef0b6b6414

Change-Id: I099faa54903acc1bdd9e366337c95e626fbb4a7c