Merge "MediaDrm API Updates per api council review" into mnc-dev