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

Change-Id: I4364167ce0af606fac084d521ff7492230f65901