Merge "Exclude only system and device intelligence roles from indicators" into sc-dev