I now see the following when I run

git cl upload

Running presubmit upload checks ...
Traceback (most recent call last):
  File "F:\depot_tools\metrics.py", line 262, in print_notice_and_exit
    yield
  File "F:\depot_tools\\git_cl.py", line 5538, in <module>
    sys.exit(main(sys.argv[1:]))
  File "F:\depot_tools\\git_cl.py", line 5520, in main
    return dispatcher.execute(OptionParser(), argv)
  File "F:\depot_tools\subcommand.py", line 252, in execute
    return command(parser, args[1:])
  File "F:\depot_tools\metrics.py", line 247, in _inner
    return self._collect_metrics(func, command_name, *args, **kwargs)
  File "F:\depot_tools\metrics.py", line 200, in _collect_metrics
    result = func(*args, **kwargs)
  File "F:\depot_tools\\git_cl.py", line 4545, in CMDupload
    return cl.CMDUpload(options, args, orig_args)
  File "F:\depot_tools\\git_cl.py", line 1583, in CMDUpload
    change=change, parallel=options.parallel)
  File "F:\depot_tools\\git_cl.py", line 1525, in RunHook
    parallel=parallel)
  File "F:\depot_tools\presubmit_support.py", line 1514, in DoPresubmitChecks
    results += executer.ExecPresubmitScript(presubmit_script, filename)
  File "F:\depot_tools\presubmit_support.py", line 1421, in ExecPresubmitScript
    result = eval(function_name + '(*__args)', context)
  File "<string>", line 1, in <module>
  File "<string>", line 3436, in CheckChangeOnUpload
  File "<string>", line 3026, in _CommonChecks
  File "<string>", line 1285, in _CheckUnwantedDependencies
TypeError: CheckAddedJavaImports() takes exactly 2 arguments (3 given)