diff --git a/recipe_modules/build_util/api.py b/recipe_modules/build_util/api.py
index 7bf9fdc..ad51817 100644
--- a/recipe_modules/build_util/api.py
+++ b/recipe_modules/build_util/api.py
@@ -28,7 +28,7 @@
     """
     gn_cmd = ['python3', checkout_path.join('flutter/tools/gn')]
     self.use_goma = '--no-goma' not in gn_args
-    self.use_rbe = '--rbe' in gn_args
+    self.use_rbe = '--no-rbe' not in gn_args
     if self.m.properties.get('no_lto', False) and '--no-lto' not in gn_args:
       gn_args += ('--no-lto',)
     gn_cmd.extend(gn_args)
@@ -65,7 +65,9 @@
       j_value = min(j_value, 800)
     return 200 if self._test_data.enabled else j_value
 
-  def _build_rbe(self, config, checkout_path, targets, tool, rbe_working_path, env):
+  def _build_rbe(
+      self, config, checkout_path, targets, tool, rbe_working_path, env
+  ):
     """Builds using ninja and rbe.
 
     Args:
@@ -112,8 +114,8 @@
         self._upload_crash_reproducer(env)
         raise
 
-  def _build_no_goma(self, config, checkout_path, targets, tool, env):
-    """Builds using ninja without goma.
+  def _build_no_goma_rbe(self, config, checkout_path, targets, tool, env):
+    """Builds using ninja without goma/rbe.
 
     Args:
       config(str): A string with the configuration to build.
@@ -168,12 +170,13 @@
       rbe_working_path(path): Path to rbe working directory.
     """
     ninja_path = checkout_path.join('flutter', 'third_party', 'ninja', 'ninja')
-    if self.use_rbe:
-      self._build_rbe(
-          config, checkout_path, targets, ninja_path, rbe_working_path, env
-      )
+
+    if self.use_goma:
+      self._build_goma(config, checkout_path, targets, ninja_path, env)
     else:
-      if self.use_goma:
-        self._build_goma(config, checkout_path, targets, ninja_path, env)
+      if self.use_rbe:
+        self._build_rbe(
+            config, checkout_path, targets, ninja_path, rbe_working_path, env
+        )
       else:
-        self._build_no_goma(config, checkout_path, targets, ninja_path, env)
+        self._build_no_goma_rbe(config, checkout_path, targets, ninja_path, env)
diff --git a/recipe_modules/build_util/examples/full.expected/basic.json b/recipe_modules/build_util/examples/full.expected/basic.json
index 8562759..1e8865c 100644
--- a/recipe_modules/build_util/examples/full.expected/basic.json
+++ b/recipe_modules/build_util/examples/full.expected/basic.json
@@ -512,6 +512,7 @@
       "python3",
       "[START_DIR]/flutter/tools/gn",
       "--no-goma",
+      "--no-rbe",
       "--no-lto"
     ],
     "env_suffixes": {
@@ -522,7 +523,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --no-goma --no-lto"
+    "name": "gn --no-goma --no-rbe --no-lto"
   },
   {
     "cmd": [
diff --git a/recipe_modules/build_util/examples/full.expected/mac.json b/recipe_modules/build_util/examples/full.expected/mac.json
index 046fac7..72066f0 100644
--- a/recipe_modules/build_util/examples/full.expected/mac.json
+++ b/recipe_modules/build_util/examples/full.expected/mac.json
@@ -512,6 +512,7 @@
       "python3",
       "[START_DIR]/flutter/tools/gn",
       "--no-goma",
+      "--no-rbe",
       "--no-lto"
     ],
     "env_suffixes": {
@@ -522,7 +523,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --no-goma --no-lto"
+    "name": "gn --no-goma --no-rbe --no-lto"
   },
   {
     "cmd": [
diff --git a/recipe_modules/build_util/examples/full.expected/win.json b/recipe_modules/build_util/examples/full.expected/win.json
index 798f840..7985ba0 100644
--- a/recipe_modules/build_util/examples/full.expected/win.json
+++ b/recipe_modules/build_util/examples/full.expected/win.json
@@ -523,6 +523,7 @@
       "python3",
       "[START_DIR]\\flutter/tools/gn",
       "--no-goma",
+      "--no-rbe",
       "--no-lto"
     ],
     "env_suffixes": {
@@ -533,7 +534,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --no-goma --no-lto"
+    "name": "gn --no-goma --no-rbe --no-lto"
   },
   {
     "cmd": [
diff --git a/recipe_modules/build_util/examples/full.py b/recipe_modules/build_util/examples/full.py
index ee23245..7cebc56 100644
--- a/recipe_modules/build_util/examples/full.py
+++ b/recipe_modules/build_util/examples/full.py
@@ -22,10 +22,11 @@
         'profile', checkout, ['mytarget'], {
             'CLANG_CRASH_DIAGNOSTICS_DIR': api.path['start_dir'],
             'FLUTTER_LOGS_DIR': api.path['start_dir']
-        }
+        },
+        rbe_working_path=api.path["cleanup"].join("rbe"),
     )
   with api.context(env_prefixes=env_prefixes):
-    api.build_util.run_gn(['--no-goma'], checkout)
+    api.build_util.run_gn(['--no-goma', '--no-rbe'], checkout)
     api.build_util.build(
         'release', checkout, ['mytarget'], {
             'CLANG_CRASH_DIAGNOSTICS_DIR': api.path['start_dir'],
diff --git a/recipes/engine_v2/builder.expected/basic.json b/recipes/engine_v2/builder.expected/basic.json
index 631ba0b..7b90619 100644
--- a/recipes/engine_v2/builder.expected/basic.json
+++ b/recipes/engine_v2/builder.expected/basic.json
@@ -1397,18 +1397,13 @@
   },
   {
     "cmd": [],
-    "name": "collect rbe logs"
+    "name": "setup goma (2)"
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/bootstrap.WARNING",
-      "/path/to/tmp/"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "restart"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1422,6 +1417,16 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_CLEANUP": "[CLEANUP]",
@@ -1448,637 +1453,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "collect rbe logs.read bootstrap.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@bootstrap.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rbe_metrics.txt",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read rbe_metrics.txt",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@rbe_metrics.txt@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy-gomaip.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy-gomaip.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy-gomaip.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_outerr.log",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy_outerr.log",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy_outerr.log@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rewrapper.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read rewrapper.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@rewrapper.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[CLEANUP]/rbe_tmp_1",
-      "*.rrpl"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.find rrpl files",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@glob@[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy_2021-10-16_22_52_23.rrpl",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy_2021-10-16_22_52_23.rrpl@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "install infra/rbe/client"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "install infra/rbe/client.ensure package directory",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a",
-      "-ensure-file",
-      "infra/rbe/client/${platform} re_client_version:0.131.1.784ddbb-gomaip",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "install infra/rbe/client.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"re_client_version:0.131.1.784ddbb-gomaip\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/rbe/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/rbe/deps"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "create rbe cache dir"
-  },
-  {
-    "cmd": [],
-    "name": "setup remote execution"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
-      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/reproxy"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "setup remote execution.start reproxy",
+    "name": "setup goma (2).start goma",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -2103,25 +1478,14 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
     },
     "env_prefixes": {
@@ -2153,12 +1517,14 @@
   },
   {
     "cmd": [],
-    "name": "teardown remote execution"
+    "name": "teardown goma (2)"
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
-      "--shutdown"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "jsonstatus",
+      "/path/to/tmp/json"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -2172,25 +1538,22 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
     },
     "env_prefixes": {
@@ -2211,14 +1574,129 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.stop reproxy",
+    "name": "teardown goma (2).goma jsonstatus",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"foo\": \"bar\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stat"
+    ],
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
+      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
+      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
+      "CLANG_MODULE_CACHE_PATH": "",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+      "ENGINE_PATH": "[CACHE]/builder",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
+      "LUCI_PR": "",
+      "LUCI_WORKDIR": "[START_DIR]",
+      "OS": "linux",
+      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "teardown goma (2).goma stats",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
-    "cmd": [],
-    "name": "teardown remote execution.collect rbe logs",
+    "cmd": [
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stop"
+    ],
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
+      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
+      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
+      "CLANG_MODULE_CACHE_PATH": "",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+      "ENGINE_PATH": "[CACHE]/builder",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
+      "LUCI_PR": "",
+      "LUCI_WORKDIR": "[START_DIR]",
+      "OS": "linux",
+      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "teardown goma (2).stop goma",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -2231,7 +1709,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CLEANUP]/rbe_tmp_1/bootstrap.WARNING",
+      "[CLEANUP]/compiler_proxy.WARNING",
       "/path/to/tmp/"
     ],
     "env": {
@@ -2246,25 +1724,14 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
     },
     "env_prefixes": {
@@ -2285,10 +1752,11 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.collect rbe logs.read bootstrap.WARNING",
+    "name": "teardown goma (2).read goma_client warning log",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@bootstrap.WARNING@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@compiler_proxy.WARNING@test log@@@",
+      "@@@STEP_LOG_END@compiler_proxy.WARNING@@@"
     ]
   },
   {
@@ -2299,7 +1767,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CLEANUP]/rbe_tmp_1/rbe_metrics.txt",
+      "[CACHE]/goma/client/goma_stats.json",
       "/path/to/tmp/"
     ],
     "env": {
@@ -2314,25 +1782,14 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
     },
     "env_prefixes": {
@@ -2353,22 +1810,25 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.collect rbe logs.read rbe_metrics.txt",
+    "name": "teardown goma (2).read goma_stats.json",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@rbe_metrics.txt@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"builder\": \"linux-host\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:24.500000\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000006000@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy.WARNING",
-      "/path/to/tmp/"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
+      "fuchsia-infra.artifacts.builds_beta_goma",
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"linux-host\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -2382,25 +1842,14 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
     },
     "env_prefixes": {
@@ -2421,351 +1870,9 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.collect rbe logs.read reproxy.WARNING",
+    "name": "teardown goma (2).upload goma stats to bigquery",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy-gomaip.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy-gomaip.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy-gomaip.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_outerr.log",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy_outerr.log",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy_outerr.log@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rewrapper.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read rewrapper.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@rewrapper.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[CLEANUP]/rbe_tmp_1",
-      "*.rrpl"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.find rrpl files",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@glob@[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy_2021-10-16_22_52_23.rrpl",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy_2021-10-16_22_52_23.rrpl@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
diff --git a/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json b/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
index c36f285..421abe3 100644
--- a/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
+++ b/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
@@ -487,6 +487,7 @@
       "--ios",
       "--rbe",
       "--no-goma",
+      "--no-rbe",
       "--rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock"
     ],
     "env": {
@@ -534,703 +535,15 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --rbe --no-goma --rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock"
-  },
-  {
-    "cmd": [],
-    "name": "collect rbe logs"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/bootstrap.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read bootstrap.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@bootstrap.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rbe_metrics.txt",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read rbe_metrics.txt",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@rbe_metrics.txt@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy-gomaip.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy-gomaip.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy-gomaip.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_outerr.log",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy_outerr.log",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy_outerr.log@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rewrapper.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read rewrapper.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@rewrapper.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[CLEANUP]/rbe_tmp_1",
-      "*.rrpl"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.find rrpl files",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@glob@[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy_2021-10-16_22_52_23.rrpl",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy_2021-10-16_22_52_23.rrpl@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "install infra/rbe/client"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "install infra/rbe/client.ensure package directory",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a",
-      "-ensure-file",
-      "infra/rbe/client/${platform} re_client_version:0.131.1.784ddbb-gomaip",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "install infra/rbe/client.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"re_client_version:0.131.1.784ddbb-gomaip\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/rbe/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/rbe/deps"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "create rbe cache dir"
-  },
-  {
-    "cmd": [],
-    "name": "setup remote execution"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
-      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/reproxy"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "setup remote execution.start reproxy",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "gn --ios --rbe --no-goma --no-rbe --rbe-server-address=unix://[CLEANUP]/rbe_tmp_1/reproxy.sock"
   },
   {
     "cmd": [
       "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
-      "-j",
-      "5",
       "-C",
-      "[CACHE]/builder/src/out/ios_debug"
+      "[CACHE]/builder/src/out/ios_debug",
+      "-j",
+      "5"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1250,19 +563,6 @@
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
     },
     "env_prefixes": {
@@ -1293,623 +593,6 @@
     "name": "build ios_debug"
   },
   {
-    "cmd": [],
-    "name": "teardown remote execution"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
-      "--shutdown"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.stop reproxy",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "teardown remote execution.collect rbe logs",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/bootstrap.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read bootstrap.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@bootstrap.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rbe_metrics.txt",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read rbe_metrics.txt",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@rbe_metrics.txt@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy-gomaip.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy-gomaip.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy-gomaip.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_outerr.log",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy_outerr.log",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy_outerr.log@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rewrapper.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read rewrapper.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@rewrapper.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[CLEANUP]/rbe_tmp_1",
-      "*.rrpl"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.find rrpl files",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@glob@[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy_2021-10-16_22_52_23.rrpl",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy_2021-10-16_22_52_23.rrpl@@@"
-    ]
-  },
-  {
     "cmd": [
       "dart",
       "pub",
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index 0ef9717..0ef1d22 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json
@@ -1942,18 +1942,13 @@
   },
   {
     "cmd": [],
-    "name": "collect rbe logs"
+    "name": "setup goma (2)"
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/bootstrap.WARNING",
-      "/path/to/tmp/"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "restart"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1967,6 +1962,16 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_CLEANUP": "[CLEANUP]",
@@ -1993,637 +1998,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "collect rbe logs.read bootstrap.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@bootstrap.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rbe_metrics.txt",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read rbe_metrics.txt",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@rbe_metrics.txt@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy-gomaip.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy-gomaip.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy-gomaip.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_outerr.log",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy_outerr.log",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy_outerr.log@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rewrapper.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read rewrapper.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@rewrapper.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[CLEANUP]/rbe_tmp_1",
-      "*.rrpl"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.find rrpl files",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@glob@[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy_2021-10-16_22_52_23.rrpl",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy_2021-10-16_22_52_23.rrpl@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "install infra/rbe/client"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "install infra/rbe/client.ensure package directory",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a",
-      "-ensure-file",
-      "infra/rbe/client/${platform} re_client_version:0.131.1.784ddbb-gomaip",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "install infra/rbe/client.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"re_client_version:0.131.1.784ddbb-gomaip\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/rbe/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/rbe/deps"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "create rbe cache dir"
-  },
-  {
-    "cmd": [],
-    "name": "setup remote execution"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
-      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/reproxy"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "setup remote execution.start reproxy",
+    "name": "setup goma (2).start goma",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -2648,25 +2023,14 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
     },
     "env_prefixes": {
@@ -2698,12 +2062,14 @@
   },
   {
     "cmd": [],
-    "name": "teardown remote execution"
+    "name": "teardown goma (2)"
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
-      "--shutdown"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "jsonstatus",
+      "/path/to/tmp/json"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -2717,25 +2083,22 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
     },
     "env_prefixes": {
@@ -2756,14 +2119,129 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.stop reproxy",
+    "name": "teardown goma (2).goma jsonstatus",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"foo\": \"bar\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stat"
+    ],
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
+      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
+      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
+      "CLANG_MODULE_CACHE_PATH": "",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+      "ENGINE_PATH": "[CACHE]/builder",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
+      "LUCI_PR": "",
+      "LUCI_WORKDIR": "[START_DIR]",
+      "OS": "darwin",
+      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "teardown goma (2).goma stats",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
-    "cmd": [],
-    "name": "teardown remote execution.collect rbe logs",
+    "cmd": [
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stop"
+    ],
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
+      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
+      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
+      "CLANG_MODULE_CACHE_PATH": "",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+      "ENGINE_PATH": "[CACHE]/builder",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
+      "LUCI_PR": "",
+      "LUCI_WORKDIR": "[START_DIR]",
+      "OS": "darwin",
+      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "teardown goma (2).stop goma",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -2776,7 +2254,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CLEANUP]/rbe_tmp_1/bootstrap.WARNING",
+      "[CLEANUP]/compiler_proxy.WARNING",
       "/path/to/tmp/"
     ],
     "env": {
@@ -2791,25 +2269,14 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
     },
     "env_prefixes": {
@@ -2830,10 +2297,11 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.collect rbe logs.read bootstrap.WARNING",
+    "name": "teardown goma (2).read goma_client warning log",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@bootstrap.WARNING@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@compiler_proxy.WARNING@test log@@@",
+      "@@@STEP_LOG_END@compiler_proxy.WARNING@@@"
     ]
   },
   {
@@ -2844,7 +2312,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CLEANUP]/rbe_tmp_1/rbe_metrics.txt",
+      "[CACHE]/goma/client/goma_stats.json",
       "/path/to/tmp/"
     ],
     "env": {
@@ -2859,25 +2327,14 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
     },
     "env_prefixes": {
@@ -2898,22 +2355,25 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.collect rbe logs.read rbe_metrics.txt",
+    "name": "teardown goma (2).read goma_stats.json",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@rbe_metrics.txt@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"builder\": \"mac-host\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:24.500000\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000006000@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy.WARNING",
-      "/path/to/tmp/"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
+      "fuchsia-infra.artifacts.builds_beta_goma",
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"mac-host\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -2927,25 +2387,14 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
     },
     "env_prefixes": {
@@ -2966,351 +2415,9 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.collect rbe logs.read reproxy.WARNING",
+    "name": "teardown goma (2).upload goma stats to bigquery",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy-gomaip.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy-gomaip.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy-gomaip.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_outerr.log",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy_outerr.log",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy_outerr.log@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rewrapper.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read rewrapper.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@rewrapper.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[CLEANUP]/rbe_tmp_1",
-      "*.rrpl"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.find rrpl files",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@glob@[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "CLANG_CRASH_DIAGNOSTICS_DIR": "[CLEANUP]/tmp_tmp_3",
-      "CLANG_MODULE_CACHE_PATH": "",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
-      "ENGINE_PATH": "[CACHE]/builder",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_CLEANUP": "[CLEANUP]",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "darwin",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy_2021-10-16_22_52_23.rrpl",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy_2021-10-16_22_52_23.rrpl@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
diff --git a/recipes/engine_v2/builder.expected/monorepo.json b/recipes/engine_v2/builder.expected/monorepo.json
index b673b1a..d5f3fbd 100644
--- a/recipes/engine_v2/builder.expected/monorepo.json
+++ b/recipes/engine_v2/builder.expected/monorepo.json
@@ -1338,18 +1338,13 @@
   },
   {
     "cmd": [],
-    "name": "collect rbe logs"
+    "name": "setup goma (2)"
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/bootstrap.WARNING",
-      "/path/to/tmp/"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "restart"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1361,6 +1356,16 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
@@ -1386,604 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "collect rbe logs.read bootstrap.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@bootstrap.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rbe_metrics.txt",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read rbe_metrics.txt",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@rbe_metrics.txt@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy-gomaip.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy-gomaip.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy-gomaip.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_outerr.log",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy_outerr.log",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy_outerr.log@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rewrapper.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read rewrapper.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@rewrapper.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[CLEANUP]/rbe_tmp_1",
-      "*.rrpl"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.find rrpl files",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@glob@[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy_2021-10-16_22_52_23.rrpl",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy_2021-10-16_22_52_23.rrpl@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "install infra/rbe/client"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "install infra/rbe/client.ensure package directory",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a",
-      "-ensure-file",
-      "infra/rbe/client/${platform} re_client_version:0.131.1.784ddbb-gomaip",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "install infra/rbe/client.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"re_client_version:0.131.1.784ddbb-gomaip\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/rbe/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/rbe/deps"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "create rbe cache dir"
-  },
-  {
-    "cmd": [],
-    "name": "setup remote execution"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
-      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/reproxy"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "setup remote execution.start reproxy",
+    "name": "setup goma (2).start goma",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -2006,24 +1414,13 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
     },
     "env_prefixes": {
@@ -2055,12 +1452,14 @@
   },
   {
     "cmd": [],
-    "name": "teardown remote execution"
+    "name": "teardown goma (2)"
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
-      "--shutdown"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "jsonstatus",
+      "/path/to/tmp/json"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -2072,24 +1471,21 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
     },
     "env_prefixes": {
@@ -2110,14 +1506,123 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.stop reproxy",
+    "name": "teardown goma (2).goma jsonstatus",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"foo\": \"bar\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stat"
+    ],
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
+      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+      "ENGINE_PATH": "[CACHE]/builder/engine",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "LUCI_WORKDIR": "[START_DIR]",
+      "OS": "linux",
+      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "dart:ci.sandbox"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "teardown goma (2).goma stats",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
-    "cmd": [],
-    "name": "teardown remote execution.collect rbe logs",
+    "cmd": [
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stop"
+    ],
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
+      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+      "ENGINE_PATH": "[CACHE]/builder/engine",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "LUCI_WORKDIR": "[START_DIR]",
+      "OS": "linux",
+      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "dart:ci.sandbox"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "teardown goma (2).stop goma",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -2130,7 +1635,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CLEANUP]/rbe_tmp_1/bootstrap.WARNING",
+      "[CLEANUP]/compiler_proxy.WARNING",
       "/path/to/tmp/"
     ],
     "env": {
@@ -2143,24 +1648,13 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
     },
     "env_prefixes": {
@@ -2181,10 +1675,11 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.collect rbe logs.read bootstrap.WARNING",
+    "name": "teardown goma (2).read goma_client warning log",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@bootstrap.WARNING@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@compiler_proxy.WARNING@test log@@@",
+      "@@@STEP_LOG_END@compiler_proxy.WARNING@@@"
     ]
   },
   {
@@ -2195,7 +1690,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CLEANUP]/rbe_tmp_1/rbe_metrics.txt",
+      "[CACHE]/goma/client/goma_stats.json",
       "/path/to/tmp/"
     ],
     "env": {
@@ -2208,24 +1703,13 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
     },
     "env_prefixes": {
@@ -2246,22 +1730,25 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.collect rbe logs.read rbe_metrics.txt",
+    "name": "teardown goma (2).read goma_stats.json",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@rbe_metrics.txt@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"builder\": \"monorepo_builder\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:24.500000\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000006000@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy.WARNING",
-      "/path/to/tmp/"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
+      "fuchsia-infra.artifacts.builds_beta_goma",
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"monorepo_builder\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -2273,24 +1760,13 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
     },
     "env_prefixes": {
@@ -2311,336 +1787,9 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.collect rbe logs.read reproxy.WARNING",
+    "name": "teardown goma (2).upload goma stats to bigquery",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy-gomaip.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy-gomaip.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy-gomaip.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_outerr.log",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy_outerr.log",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy_outerr.log@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rewrapper.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read rewrapper.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@rewrapper.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[CLEANUP]/rbe_tmp_1",
-      "*.rrpl"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.find rrpl files",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@glob@[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy_2021-10-16_22_52_23.rrpl",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy_2021-10-16_22_52_23.rrpl@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
diff --git a/recipes/engine_v2/builder.expected/monorepo_tryjob.json b/recipes/engine_v2/builder.expected/monorepo_tryjob.json
index 110f767..1b5a4dc 100644
--- a/recipes/engine_v2/builder.expected/monorepo_tryjob.json
+++ b/recipes/engine_v2/builder.expected/monorepo_tryjob.json
@@ -1425,18 +1425,13 @@
   },
   {
     "cmd": [],
-    "name": "collect rbe logs"
+    "name": "setup goma (2)"
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/bootstrap.WARNING",
-      "/path/to/tmp/"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "restart"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1448,6 +1443,16 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
@@ -1473,604 +1478,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "collect rbe logs.read bootstrap.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@bootstrap.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rbe_metrics.txt",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read rbe_metrics.txt",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@rbe_metrics.txt@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy-gomaip.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy-gomaip.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy-gomaip.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_outerr.log",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy_outerr.log",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy_outerr.log@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rewrapper.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read rewrapper.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@rewrapper.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[CLEANUP]/rbe_tmp_1",
-      "*.rrpl"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.find rrpl files",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@glob@[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect rbe logs.read reproxy_2021-10-16_22_52_23.rrpl",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@reproxy_2021-10-16_22_52_23.rrpl@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "install infra/rbe/client"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "install infra/rbe/client.ensure package directory",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a",
-      "-ensure-file",
-      "infra/rbe/client/${platform} re_client_version:0.131.1.784ddbb-gomaip",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "install infra/rbe/client.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"re_client_version:0.131.1.784ddbb-gomaip\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/rbe/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/rbe/deps"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "create rbe cache dir"
-  },
-  {
-    "cmd": [],
-    "name": "setup remote execution"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
-      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/reproxy"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "setup remote execution.start reproxy",
+    "name": "setup goma (2).start goma",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -2093,24 +1501,13 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": ""
     },
     "env_prefixes": {
@@ -2142,12 +1539,14 @@
   },
   {
     "cmd": [],
-    "name": "teardown remote execution"
+    "name": "teardown goma (2)"
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/b81cce70892afbba54fe5a59b9f11369108e2ad2b39eec8a2d938caf7087875a/bootstrap",
-      "--shutdown"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "jsonstatus",
+      "/path/to/tmp/json"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -2159,24 +1558,21 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": ""
     },
     "env_prefixes": {
@@ -2197,14 +1593,123 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.stop reproxy",
+    "name": "teardown goma (2).goma jsonstatus",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"foo\": \"bar\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stat"
+    ],
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
+      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+      "ENGINE_PATH": "[CACHE]/builder/engine",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "LUCI_WORKDIR": "[START_DIR]",
+      "OS": "linux",
+      "REVISION": ""
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "dart:ci.sandbox"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "teardown goma (2).goma stats",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
-    "cmd": [],
-    "name": "teardown remote execution.collect rbe logs",
+    "cmd": [
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stop"
+    ],
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
+      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
+      "ENGINE_PATH": "[CACHE]/builder/engine",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "",
+      "GLOG_log_dir": "[CLEANUP]",
+      "GOMA_CACHE_DIR": "[CACHE]/goma",
+      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
+      "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
+      "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
+      "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
+      "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
+      "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "LUCI_WORKDIR": "[START_DIR]",
+      "OS": "linux",
+      "REVISION": ""
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "dart:ci.sandbox"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "teardown goma (2).stop goma",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -2217,7 +1722,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CLEANUP]/rbe_tmp_1/bootstrap.WARNING",
+      "[CLEANUP]/compiler_proxy.WARNING",
       "/path/to/tmp/"
     ],
     "env": {
@@ -2230,24 +1735,13 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": ""
     },
     "env_prefixes": {
@@ -2268,10 +1762,11 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.collect rbe logs.read bootstrap.WARNING",
+    "name": "teardown goma (2).read goma_client warning log",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@bootstrap.WARNING@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@compiler_proxy.WARNING@test log@@@",
+      "@@@STEP_LOG_END@compiler_proxy.WARNING@@@"
     ]
   },
   {
@@ -2282,7 +1777,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CLEANUP]/rbe_tmp_1/rbe_metrics.txt",
+      "[CACHE]/goma/client/goma_stats.json",
       "/path/to/tmp/"
     ],
     "env": {
@@ -2295,24 +1790,13 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": ""
     },
     "env_prefixes": {
@@ -2333,22 +1817,25 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.collect rbe logs.read rbe_metrics.txt",
+    "name": "teardown goma (2).read goma_stats.json",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@rbe_metrics.txt@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"builder\": \"monorepo_builder_try\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:24.500000\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000006000@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy.WARNING",
-      "/path/to/tmp/"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
+      "fuchsia-infra.artifacts.builds_beta_goma",
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"monorepo_builder_try\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -2360,24 +1847,13 @@
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
       "GIT_BRANCH": "",
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
       "REVISION": ""
     },
     "env_prefixes": {
@@ -2398,336 +1874,9 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown remote execution.collect rbe logs.read reproxy.WARNING",
+    "name": "teardown goma (2).upload goma stats to bigquery",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy-gomaip.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy-gomaip.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy-gomaip.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_outerr.log",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy_outerr.log",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy_outerr.log@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/rewrapper.WARNING",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read rewrapper.WARNING",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@rewrapper.WARNING@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[CLEANUP]/rbe_tmp_1",
-      "*.rrpl"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.find rrpl files",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@glob@[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/rbe_tmp_1/reproxy_2021-10-16_22_52_23.rrpl",
-      "/path/to/tmp/"
-    ],
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
-      "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "ENGINE_CHECKOUT_PATH": "[CACHE]/builder/engine",
-      "ENGINE_PATH": "[CACHE]/builder/engine",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "LUCI_WORKDIR": "[START_DIR]",
-      "OS": "linux",
-      "RBE_cache_dir": "[CACHE]/rbe/deps",
-      "RBE_deps_cache_max_mb": "512",
-      "RBE_enable_deps_cache": "true",
-      "RBE_instance": "fake_rbe_instance",
-      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_log_format": "reducedtext",
-      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
-      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_service": "remotebuildexecution.googleapis.com:443",
-      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
-      "RBE_use_application_default_credentials": "false",
-      "RBE_use_gce_credentials": "true",
-      "REVISION": ""
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci.sandbox"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "teardown remote execution.collect rbe logs.read reproxy_2021-10-16_22_52_23.rrpl",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_END@reproxy_2021-10-16_22_52_23.rrpl@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
diff --git a/recipes/engine_v2/builder.py b/recipes/engine_v2/builder.py
index 3badc36..740f83b 100644
--- a/recipes/engine_v2/builder.py
+++ b/recipes/engine_v2/builder.py
@@ -182,8 +182,9 @@
     with api.context(env=env, env_prefixes=env_prefixes):
       gn = list(gn)
       if api.flutter_bcid.is_official_build():
-        # Goma is not supported for official builds.
+        # Goma/RBE is not supported for official builds.
         gn.append('--no-goma')
+        gn.append('--no-rbe')
       if api.monorepo.is_monorepo_ci_build:
         version = env['REVISION']
         gn.append(f'--gn-args=engine_version="{version}"')