Merge "Fix API issues in DrmRights class."