Merge "Add OBSERVE_ROLE_HOLDERS permission to shell."