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