Merge "Remove media.cas requirement." into oc-mr1-dev