Merge "Remove system scope token usage"