[roll] Manual roll of recipe dependencies to get goma python3 change

This fixes all conflicts except for the Fuchsia repo.

Change-Id: I5a69dc202b915947ed06f7f6304dae0c78426d05
Reviewed-on: https://dart-review.googlesource.com/c/recipes/+/211701
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
diff --git a/README.recipes.md b/README.recipes.md
index 56e008d..2aec609 100644
--- a/README.recipes.md
+++ b/README.recipes.md
@@ -272,31 +272,31 @@
 
 &mdash; **def [RunSteps](/recipes/roller/roll_to_dev.py#36)(api, properties):**
 
-[build/recipe_modules/goma]: https://chromium.googlesource.com/chromium/tools/build.git/+/f411e1c4e0b8c28ad7583f6403b39bec9629efc1/recipes/README.recipes.md#recipe_modules-goma
-[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/bdc7adc6f733eb2e145f8eaf4d99f951f8d013b0/recipes/README.recipes.md#recipe_modules-bot_update
-[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/bdc7adc6f733eb2e145f8eaf4d99f951f8d013b0/recipes/README.recipes.md#recipe_modules-depot_tools
-[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/bdc7adc6f733eb2e145f8eaf4d99f951f8d013b0/recipes/README.recipes.md#recipe_modules-gclient
-[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/bdc7adc6f733eb2e145f8eaf4d99f951f8d013b0/recipes/README.recipes.md#recipe_modules-git
-[depot_tools/recipe_modules/gitiles]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/bdc7adc6f733eb2e145f8eaf4d99f951f8d013b0/recipes/README.recipes.md#recipe_modules-gitiles
-[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/bdc7adc6f733eb2e145f8eaf4d99f951f8d013b0/recipes/README.recipes.md#recipe_modules-gsutil
-[depot_tools/recipe_modules/osx_sdk]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/bdc7adc6f733eb2e145f8eaf4d99f951f8d013b0/recipes/README.recipes.md#recipe_modules-osx_sdk
-[depot_tools/recipe_modules/presubmit]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/bdc7adc6f733eb2e145f8eaf4d99f951f8d013b0/recipes/README.recipes.md#recipe_modules-presubmit
-[depot_tools/recipe_modules/tryserver]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/bdc7adc6f733eb2e145f8eaf4d99f951f8d013b0/recipes/README.recipes.md#recipe_modules-tryserver
+[build/recipe_modules/goma]: https://chromium.googlesource.com/chromium/tools/build.git/+/037be3e0d5fcfd4f35553cab321b20f1d42a5aa5/recipes/README.recipes.md#recipe_modules-goma
+[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/982aad0e2af601a55fd441570f76acff15e345d3/recipes/README.recipes.md#recipe_modules-bot_update
+[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/982aad0e2af601a55fd441570f76acff15e345d3/recipes/README.recipes.md#recipe_modules-depot_tools
+[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/982aad0e2af601a55fd441570f76acff15e345d3/recipes/README.recipes.md#recipe_modules-gclient
+[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/982aad0e2af601a55fd441570f76acff15e345d3/recipes/README.recipes.md#recipe_modules-git
+[depot_tools/recipe_modules/gitiles]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/982aad0e2af601a55fd441570f76acff15e345d3/recipes/README.recipes.md#recipe_modules-gitiles
+[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/982aad0e2af601a55fd441570f76acff15e345d3/recipes/README.recipes.md#recipe_modules-gsutil
+[depot_tools/recipe_modules/osx_sdk]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/982aad0e2af601a55fd441570f76acff15e345d3/recipes/README.recipes.md#recipe_modules-osx_sdk
+[depot_tools/recipe_modules/presubmit]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/982aad0e2af601a55fd441570f76acff15e345d3/recipes/README.recipes.md#recipe_modules-presubmit
+[depot_tools/recipe_modules/tryserver]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/982aad0e2af601a55fd441570f76acff15e345d3/recipes/README.recipes.md#recipe_modules-tryserver
 [fuchsia/recipe_modules/gerrit]: https://fuchsia.googlesource.com/infra/recipes/+/4bbc9ba040a635841c1613e452ff593e89ab51a8/README.recipes.md#recipe_modules-gerrit
-[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-buildbucket
-[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-cipd
-[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-context
-[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-file
-[recipe_engine/recipe_modules/isolated]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-isolated
-[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-json
-[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-path
-[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-platform
-[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-properties
-[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-raw_io
-[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-runtime
-[recipe_engine/recipe_modules/service_account]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-service_account
-[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-step
-[recipe_engine/recipe_modules/swarming]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-swarming
-[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-time
-[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/README.recipes.md#recipe_modules-url
-[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/de0fdebeb07a64732b21daa1213a7295e1cbd445/recipe_engine/recipe_api.py#881
+[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-buildbucket
+[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-cipd
+[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-context
+[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-file
+[recipe_engine/recipe_modules/isolated]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-isolated
+[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-json
+[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-path
+[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-platform
+[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-properties
+[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-raw_io
+[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-runtime
+[recipe_engine/recipe_modules/service_account]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-service_account
+[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-step
+[recipe_engine/recipe_modules/swarming]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-swarming
+[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-time
+[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/README.recipes.md#recipe_modules-url
+[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a357987df4e8bee834c80cace3066518004e7e27/recipe_engine/recipe_api.py#881
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 2128104..edccc98 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -21,22 +21,22 @@
   "deps": {
     "build": {
       "branch": "refs/heads/main",
-      "revision": "f411e1c4e0b8c28ad7583f6403b39bec9629efc1",
+      "revision": "037be3e0d5fcfd4f35553cab321b20f1d42a5aa5",
       "url": "https://chromium.googlesource.com/chromium/tools/build.git"
     },
     "chromiumos_config": {
       "branch": "refs/heads/main",
-      "revision": "a4d1903473d604dde5a65040b2ea6504caec247a",
+      "revision": "4ad9c86ef36080cefdd1b03025c14675914b479b",
       "url": "https://chromium.googlesource.com/chromiumos/config.git"
     },
     "chromiumos_proto": {
       "branch": "refs/heads/main",
-      "revision": "cdf5121612985658f9eaf040941e4b869ad3bb0d",
+      "revision": "82d95d4b463485cf4de5369104aac3ecde6c8f21",
       "url": "https://chromium.googlesource.com/chromiumos/infra/proto.git"
     },
     "depot_tools": {
       "branch": "refs/heads/main",
-      "revision": "bdc7adc6f733eb2e145f8eaf4d99f951f8d013b0",
+      "revision": "982aad0e2af601a55fd441570f76acff15e345d3",
       "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
     },
     "fuchsia": {
@@ -46,12 +46,12 @@
     },
     "infra": {
       "branch": "refs/heads/main",
-      "revision": "60925283f64a72e0c7f425b419b26232e954f155",
+      "revision": "e3f096d60c08ffdfd9f58e2f05b3639cedd64f53",
       "url": "https://chromium.googlesource.com/infra/infra.git"
     },
     "recipe_engine": {
       "branch": "refs/heads/main",
-      "revision": "de0fdebeb07a64732b21daa1213a7295e1cbd445",
+      "revision": "a357987df4e8bee834c80cace3066518004e7e27",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },
diff --git a/recipe_modules/build/tests/test_build.expected/fail.json b/recipe_modules/build/tests/test_build.expected/fail.json
index 409d7eb..ce6e6d7 100644
--- a/recipe_modules/build/tests/test_build.expected/fail.json
+++ b/recipe_modules/build/tests/test_build.expected/fail.json
@@ -117,8 +117,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -253,8 +252,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -296,8 +294,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -327,8 +324,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -385,10 +381,7 @@
       "--goma-crash-report-id-file",
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
-      "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
-      "--is-luci",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}"
     ],
     "cwd": "None",
     "env": {
diff --git a/recipe_modules/build/tests/test_build.expected/success.json b/recipe_modules/build/tests/test_build.expected/success.json
index 2f1daec..ee3fe7a 100644
--- a/recipe_modules/build/tests/test_build.expected/success.json
+++ b/recipe_modules/build/tests/test_build.expected/success.json
@@ -117,8 +117,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -250,8 +249,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -293,8 +291,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -324,8 +321,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -382,10 +378,7 @@
       "--goma-crash-report-id-file",
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
-      "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
-      "--is-luci",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}"
     ],
     "cwd": "None",
     "env": {
diff --git a/recipe_modules/build/tests/test_build.expected/timeout.json b/recipe_modules/build/tests/test_build.expected/timeout.json
index 1055209..de2bcab 100644
--- a/recipe_modules/build/tests/test_build.expected/timeout.json
+++ b/recipe_modules/build/tests/test_build.expected/timeout.json
@@ -117,8 +117,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -253,8 +252,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -296,8 +294,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -327,8 +324,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -383,10 +379,7 @@
       "--goma-crash-report-id-file",
       "[TMP_BASE]/crash_report_id",
       "--builder-id-json",
-      "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}",
-      "--is-luci",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "{\"bucket\": \"\", \"builder\": \"\", \"project\": \"\"}"
     ],
     "cwd": "None",
     "env": {
diff --git a/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json b/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
index 291042b..d359664 100644
--- a/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
+++ b/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
@@ -648,8 +648,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -763,8 +762,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -810,8 +808,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -845,8 +842,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -910,11 +906,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"analyzer-linux-release\", \"project\": \"dart\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "analyzer-linux-release",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "analyzer-linux-release"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
diff --git a/recipe_modules/dart/examples/example.expected/example-mac.json b/recipe_modules/dart/examples/example.expected/example-mac.json
index 712e043..68930886 100644
--- a/recipe_modules/dart/examples/example.expected/example-mac.json
+++ b/recipe_modules/dart/examples/example.expected/example-mac.json
@@ -648,8 +648,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -763,8 +762,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -810,8 +808,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -845,8 +842,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -910,11 +906,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"vm-kernel-mac-release-x64\", \"project\": \"dart\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "vm-kernel-mac-release-x64",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "vm-kernel-mac-release-x64"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
diff --git a/recipe_modules/dart/examples/example.expected/vm-win.json b/recipe_modules/dart/examples/example.expected/vm-win.json
index 173db0b..3c487f9 100644
--- a/recipe_modules/dart/examples/example.expected/vm-win.json
+++ b/recipe_modules/dart/examples/example.expected/vm-win.json
@@ -689,8 +689,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -809,8 +808,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]\\goma_jsonstatus.json"
@@ -858,8 +856,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -895,8 +892,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -962,11 +958,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"vm-kernel-win-release-simarm_x64\", \"project\": \"dart\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "vm-kernel-win-release-simarm_x64",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "vm-kernel-win-release-simarm_x64"
     ],
     "cwd": "[CACHE]\\builder\\sdk",
     "env": {
diff --git a/recipes/dart/flutter_engine.expected/flutter-engine-linux.json b/recipes/dart/flutter_engine.expected/flutter-engine-linux.json
index 3883b92..0beb66a 100644
--- a/recipes/dart/flutter_engine.expected/flutter-engine-linux.json
+++ b/recipes/dart/flutter_engine.expected/flutter-engine-linux.json
@@ -339,8 +339,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -423,8 +422,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -460,8 +458,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -485,8 +482,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -542,11 +538,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -621,8 +614,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -706,8 +698,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -743,8 +734,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -768,8 +758,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -825,11 +814,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -926,8 +912,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1010,8 +995,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -1047,8 +1031,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1072,8 +1055,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1129,11 +1111,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1230,8 +1209,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1314,8 +1292,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -1351,8 +1328,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1376,8 +1352,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1433,11 +1408,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1538,8 +1510,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1624,8 +1595,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -1661,8 +1631,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1686,8 +1655,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1743,11 +1711,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1963,8 +1928,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2050,8 +2014,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -2088,8 +2051,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2114,8 +2076,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2172,11 +2133,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2254,8 +2212,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2342,8 +2299,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -2380,8 +2336,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2406,8 +2361,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2464,11 +2418,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2571,8 +2522,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2658,8 +2608,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -2696,8 +2645,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2722,8 +2670,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2780,11 +2727,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2887,8 +2831,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2974,8 +2917,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3012,8 +2954,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3038,8 +2979,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3096,11 +3036,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3203,8 +3140,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3290,8 +3226,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3328,8 +3263,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3354,8 +3288,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3412,11 +3345,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3519,8 +3449,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3606,8 +3535,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3644,8 +3572,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3670,8 +3597,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3728,11 +3654,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3835,8 +3758,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3922,8 +3844,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3960,8 +3881,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3986,8 +3906,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4044,11 +3963,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4151,8 +4067,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4238,8 +4153,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -4276,8 +4190,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4302,8 +4215,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,11 +4272,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4467,8 +4376,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4554,8 +4462,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -4592,8 +4499,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4618,8 +4524,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4676,11 +4581,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4783,8 +4685,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4870,8 +4771,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -4908,8 +4808,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4934,8 +4833,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4992,11 +4890,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/dart/flutter_engine.expected/only-run-webtests-suite.json b/recipes/dart/flutter_engine.expected/only-run-webtests-suite.json
index 1fcec2d..dae3d6d 100644
--- a/recipes/dart/flutter_engine.expected/only-run-webtests-suite.json
+++ b/recipes/dart/flutter_engine.expected/only-run-webtests-suite.json
@@ -339,8 +339,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -423,8 +422,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -460,8 +458,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -485,8 +482,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -542,11 +538,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -621,8 +614,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -706,8 +698,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -743,8 +734,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -768,8 +758,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -825,11 +814,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -926,8 +912,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1010,8 +995,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -1047,8 +1031,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1072,8 +1055,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1129,11 +1111,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1230,8 +1209,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1314,8 +1292,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -1351,8 +1328,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1376,8 +1352,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1433,11 +1408,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1538,8 +1510,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1624,8 +1595,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -1661,8 +1631,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1686,8 +1655,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1743,11 +1711,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1963,8 +1928,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2050,8 +2014,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -2088,8 +2051,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2114,8 +2076,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2172,11 +2133,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2254,8 +2212,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2342,8 +2299,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -2380,8 +2336,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2406,8 +2361,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2464,11 +2418,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2571,8 +2522,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2658,8 +2608,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -2696,8 +2645,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2722,8 +2670,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2780,11 +2727,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2887,8 +2831,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2974,8 +2917,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3012,8 +2954,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3038,8 +2979,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3096,11 +3036,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3203,8 +3140,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3290,8 +3226,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3328,8 +3263,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3354,8 +3288,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3412,11 +3345,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3519,8 +3449,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3606,8 +3535,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3644,8 +3572,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3670,8 +3597,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3728,11 +3654,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3835,8 +3758,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3922,8 +3844,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3960,8 +3881,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3986,8 +3906,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4044,11 +3963,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4151,8 +4067,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4238,8 +4153,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -4276,8 +4190,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4302,8 +4215,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,11 +4272,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4467,8 +4376,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4554,8 +4462,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -4592,8 +4499,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4618,8 +4524,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4676,11 +4581,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4783,8 +4685,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4870,8 +4771,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -4908,8 +4808,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4934,8 +4833,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4992,11 +4890,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/dart/flutter_engine.expected/run-all-test-suites.json b/recipes/dart/flutter_engine.expected/run-all-test-suites.json
index 3883b92..0beb66a 100644
--- a/recipes/dart/flutter_engine.expected/run-all-test-suites.json
+++ b/recipes/dart/flutter_engine.expected/run-all-test-suites.json
@@ -339,8 +339,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -423,8 +422,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -460,8 +458,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -485,8 +482,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -542,11 +538,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -621,8 +614,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -706,8 +698,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -743,8 +734,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -768,8 +758,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -825,11 +814,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -926,8 +912,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1010,8 +995,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -1047,8 +1031,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1072,8 +1055,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1129,11 +1111,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1230,8 +1209,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1314,8 +1292,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -1351,8 +1328,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1376,8 +1352,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1433,11 +1408,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1538,8 +1510,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1624,8 +1595,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -1661,8 +1631,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1686,8 +1655,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1743,11 +1711,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1963,8 +1928,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2050,8 +2014,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -2088,8 +2051,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2114,8 +2076,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2172,11 +2133,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2254,8 +2212,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2342,8 +2299,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -2380,8 +2336,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2406,8 +2361,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2464,11 +2418,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2571,8 +2522,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2658,8 +2608,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -2696,8 +2645,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2722,8 +2670,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2780,11 +2727,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2887,8 +2831,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2974,8 +2917,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3012,8 +2954,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3038,8 +2979,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3096,11 +3036,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3203,8 +3140,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3290,8 +3226,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3328,8 +3263,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3354,8 +3288,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3412,11 +3345,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3519,8 +3449,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3606,8 +3535,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3644,8 +3572,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3670,8 +3597,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3728,11 +3654,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3835,8 +3758,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3922,8 +3844,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3960,8 +3881,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3986,8 +3906,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4044,11 +3963,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4151,8 +4067,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4238,8 +4153,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -4276,8 +4190,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4302,8 +4215,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,11 +4272,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4467,8 +4376,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4554,8 +4462,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -4592,8 +4499,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4618,8 +4524,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4676,11 +4581,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4783,8 +4685,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4870,8 +4771,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -4908,8 +4808,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4934,8 +4833,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4992,11 +4890,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/dart/flutter_engine.expected/run-undefined-test-suite.json b/recipes/dart/flutter_engine.expected/run-undefined-test-suite.json
index 97d1d2d..6d5dde0 100644
--- a/recipes/dart/flutter_engine.expected/run-undefined-test-suite.json
+++ b/recipes/dart/flutter_engine.expected/run-undefined-test-suite.json
@@ -339,8 +339,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -423,8 +422,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -460,8 +458,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -485,8 +482,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -542,11 +538,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -621,8 +614,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -706,8 +698,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -743,8 +734,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -768,8 +758,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -825,11 +814,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -926,8 +912,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1010,8 +995,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -1047,8 +1031,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1072,8 +1055,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1129,11 +1111,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1230,8 +1209,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1314,8 +1292,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -1351,8 +1328,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1376,8 +1352,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1433,11 +1408,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1538,8 +1510,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1624,8 +1595,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -1661,8 +1631,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1686,8 +1655,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1743,11 +1711,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1963,8 +1928,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2050,8 +2014,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -2088,8 +2051,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2114,8 +2076,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2172,11 +2133,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2254,8 +2212,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2342,8 +2299,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -2380,8 +2336,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2406,8 +2361,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2464,11 +2418,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2571,8 +2522,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2658,8 +2608,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -2696,8 +2645,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2722,8 +2670,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2780,11 +2727,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2887,8 +2831,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2974,8 +2917,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3012,8 +2954,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3038,8 +2979,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3096,11 +3036,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3203,8 +3140,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3290,8 +3226,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3328,8 +3263,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3354,8 +3288,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3412,11 +3345,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3519,8 +3449,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3606,8 +3535,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3644,8 +3572,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3670,8 +3597,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3728,11 +3654,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3835,8 +3758,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3922,8 +3844,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -3960,8 +3881,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3986,8 +3906,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4044,11 +3963,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4151,8 +4067,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4238,8 +4153,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -4276,8 +4190,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4302,8 +4215,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,11 +4272,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4467,8 +4376,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4554,8 +4462,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -4592,8 +4499,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4618,8 +4524,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4676,11 +4581,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4783,8 +4685,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4870,8 +4771,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -4908,8 +4808,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4934,8 +4833,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4992,11 +4890,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "flutter-engine-linux"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json b/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json
index ffe4c9c..dc79e8d 100644
--- a/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json
+++ b/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json
@@ -500,8 +500,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -620,8 +619,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -668,8 +666,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -704,8 +701,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -770,11 +766,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"try\", \"builder\": \"dart2js-win-debug-x64-firefox-try\", \"project\": \"dart\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "dart2js-win-debug-x64-firefox-try",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "dart2js-win-debug-x64-firefox-try"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
diff --git a/recipes/dart/neo.expected/failing-test-step-starts-bisection.json b/recipes/dart/neo.expected/failing-test-step-starts-bisection.json
index 217e387..ca47daa 100644
--- a/recipes/dart/neo.expected/failing-test-step-starts-bisection.json
+++ b/recipes/dart/neo.expected/failing-test-step-starts-bisection.json
@@ -447,8 +447,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -567,8 +566,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -615,8 +613,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -651,8 +648,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -717,11 +713,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"dart2js-win-debug-x64-firefox\", \"project\": \"dart\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "dart2js-win-debug-x64-firefox",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "dart2js-win-debug-x64-firefox"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
diff --git a/recipes/dart/neo.expected/infra-failure-does-not-start-bisection.json b/recipes/dart/neo.expected/infra-failure-does-not-start-bisection.json
index 1ced915..c969aad 100644
--- a/recipes/dart/neo.expected/infra-failure-does-not-start-bisection.json
+++ b/recipes/dart/neo.expected/infra-failure-does-not-start-bisection.json
@@ -447,8 +447,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -567,8 +566,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -615,8 +613,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -651,8 +648,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -717,11 +713,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"dart2js-win-debug-x64-firefox\", \"project\": \"dart\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "dart2js-win-debug-x64-firefox",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "dart2js-win-debug-x64-firefox"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
diff --git a/recipes/dart/neo.expected/successful-build-does-not-start-bisection.json b/recipes/dart/neo.expected/successful-build-does-not-start-bisection.json
index 09b47b4..2ae2056 100644
--- a/recipes/dart/neo.expected/successful-build-does-not-start-bisection.json
+++ b/recipes/dart/neo.expected/successful-build-does-not-start-bisection.json
@@ -447,8 +447,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -567,8 +566,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "[TMP_BASE]/goma_jsonstatus.json"
@@ -615,8 +613,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -651,8 +648,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
+      "python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -717,11 +713,8 @@
       "8945511751514863184",
       "--builder-id-json",
       "{\"bucket\": \"ci\", \"builder\": \"dart2js-win-debug-x64-firefox\", \"project\": \"dart\"}",
-      "--is-luci",
       "--buildbot-buildername",
-      "dart2js-win-debug-x64-firefox",
-      "--buildbot-slavename",
-      "fake-bot-id"
+      "dart2js-win-debug-x64-firefox"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {