Merge "StatsCompanionService permissions"