Merge "Implement new MediaDrm methods"