Merge "Add Executor to Permission Group methods in PermissionControllerManager" into sc-dev