Merge "media: Address API review comments" into oc-dev
am: ab312729ce

Change-Id: Ie957c8c197ff2459cbc5d32c1716d78d0752ddbe