Merge "media: Address api council comments." into oc-mr1-dev