Merge "Add constants to support role holder updates"