Merge "Remove kKeyIsDRM metadata key"