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

Change-Id: Ic22500200177a43874dbbd5a4fb327a8c9a7d25f