Merge "Add new MediaDrm methods"