Merge "Respond to API Review comments on MediaDrm" into sc-dev