Merge "Remove media.cas requirement." into oc-mr1-dev
am: 05143cf85e

Change-Id: I9dd749cdea45b144873ece20f41b8589bba20078