Reland "Add reclient CQ shadow builders as experimental"

This reverts commit 583fd2ba9961137d9b7df5e9fc917f6cc7c82e80.

Reason for revert: In the previous attempt, the shadow builders were blocking CQ.
In this reland, it sets cq=None instead of experimental=True so that they are not triggered automatically(?)
After confirming all builders work, I want to set cq to these builders, again. (ideally non-blocking builders.)

Original change's description:
> Revert "Add reclient CQ shadow builders as experimental"
>
> This reverts commit e149d4d1000424d897e72ea4ef7aa2b777842e8d.
>
> Reason for revert: Reason for revert: These builders seems blocking CQ.
> http://screen/44GuRKkhNHdwj8j
>
> Original change's description:
> > Add reclient CQ shadow builders as experimental
> >
> > FWIU, setting exprimental=True makes CQ builders non-blocking.
> > If not, please revert this CL.
> >
> > Bug: b/243594984
> > Change-Id: Ia20e37f4fe9ce629d6fddc9ab8b652b5b8a00572
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/286522
> > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> > Auto-Submit: Junji Watanabe <jwata@google.com>
> > Commit-Queue: Junji Watanabe <jwata@google.com>
> > Cr-Commit-Position: refs/heads/main@{#38817}
>
> Bug: b/243594984
> Change-Id: Ie3dd7707a920c68c53cb80bf5f86737c7f559393
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/286543
> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
> Auto-Submit: Junji Watanabe <jwata@google.com>
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#38818}

Bug: b/243594984
Change-Id: I573124da0c63a56d9cdd81f637bc984487c98208
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/286544
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Junji Watanabe <jwata@google.com>
Cr-Commit-Position: refs/heads/main@{#38820}
diff --git a/infra/config/config.star b/infra/config/config.star
index 1c60242..139e057 100755
--- a/infra/config/config.star
+++ b/infra/config/config.star
@@ -597,6 +597,7 @@
     properties = properties or {}
     properties["builder_group"] = "tryserver.webrtc"
     properties.update(make_goma_properties(enable_ats = goma_enable_ats, jobs = goma_jobs))
+    properties.update(make_reclient_properties("rbe-webrtc-untrusted"))
     if cq != None:
         luci.cq_tryjob_verifier(name, cq_group = "cq", **cq)
         if branch_cq:
@@ -712,6 +713,7 @@
 android_try_job("android_arm_dbg")
 android_builder("Android32", "Android|arm|rel")
 android_try_job("android_arm_rel")
+android_try_job("android_arm_rel_reclient", cq = None)
 android_builder("Android32 Builder arm", "Android|arm|size", perf_cat = "Android|arm|Builder|", prioritized = True)
 android_try_job("android_compile_arm_rel")
 perf_builder("Perf Android32 (M Nexus5)", "Android|arm|Tester|M Nexus5", triggered_by = ["Android32 Builder arm"])
@@ -742,6 +744,7 @@
 ios_try_job("ios_compile_arm64_dbg")
 ios_builder("iOS64 Release", "iOS|arm64|rel")
 ios_try_job("ios_compile_arm64_rel")
+ios_try_job("ios_compile_arm64_rel_reclient", cq = None)
 ios_builder("iOS64 Sim Debug (iOS 14)", "iOS|x64|14")
 ios_try_job("ios_sim_x64_dbg_ios14")
 ios_builder("iOS64 Sim Debug (iOS 13)", "iOS|x64|13")
@@ -760,6 +763,7 @@
 linux_try_job("linux_compile_dbg")
 linux_builder("Linux64 Release", "Linux|x64|rel")
 linux_try_job("linux_rel")
+linux_try_job("linux_rel_reclient", cq = None)
 linux_builder("Linux64 Builder", "Linux|x64|size", perf_cat = "Linux|x64|Builder|", prioritized = True)
 linux_try_job("linux_compile_rel")
 perf_builder("Perf Linux Bionic", "Linux|x64|Tester|Bionic", triggered_by = ["Linux64 Builder"])
@@ -800,6 +804,7 @@
 mac_builder("Mac64 Release", "Mac|x64|rel")
 
 mac_try_job("mac_rel")
+mac_try_job("mac_rel_reclient", cq = None)
 mac_try_job("mac_compile_rel", cq = None)
 mac_builder("Mac64 Builder", ci_cat = None, perf_cat = "Mac|x64|Builder|")
 mac_builder("MacArm64 Builder", ci_cat = None, perf_cat = "Mac|arm64|Builder|")
@@ -827,6 +832,7 @@
 win_builder("Win64 Release (Clang)", "Win Clang|x64|rel")
 win_try_job("win_x64_clang_rel", cq = None)
 win_try_job("win_compile_x64_clang_rel")
+win_try_job("win_compile_x64_clang_rel_reclient", cq = None)
 win_builder("Win64 ASan", "Win Clang|x64|asan")
 win_try_job("win_asan")
 win_builder("Win (more configs)", "Win Clang|x86|more")
diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
index e982961..6d8852c 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -3220,6 +3220,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3266,6 +3270,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3312,6 +3320,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3358,6 +3370,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3404,6 +3420,60 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.webrtc",'
+        '  "recipe": "webrtc/standalone"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "webrtc-ci"
+          dataset: "resultdb"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_arm_rel_reclient"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.webrtc.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3450,6 +3520,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3496,6 +3570,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3542,6 +3620,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3588,6 +3670,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3634,6 +3720,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3680,6 +3770,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3726,6 +3820,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3772,6 +3870,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3818,6 +3920,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3865,6 +3971,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3911,6 +4021,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -3962,6 +4076,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4013,6 +4131,65 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.webrtc",'
+        '  "recipe": "webrtc/standalone",'
+        '  "xcode_build_version": "13c100"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 7200
+      caches {
+        name: "xcode_ios_13c100"
+        path: "xcode_ios_13c100.app"
+      }
+      build_numbers: YES
+      service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "webrtc-ci"
+          dataset: "resultdb"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios_compile_arm64_rel_reclient"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.webrtc.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4064,6 +4241,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4115,6 +4296,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4166,6 +4351,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4218,6 +4407,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4265,6 +4458,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4312,6 +4509,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4359,6 +4560,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4406,6 +4611,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4453,6 +4662,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4500,6 +4713,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4547,6 +4764,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4594,6 +4815,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4641,6 +4866,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4688,6 +4917,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4735,6 +4968,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4782,6 +5019,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4829,6 +5070,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4876,6 +5121,61 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.webrtc",'
+        '  "recipe": "webrtc/standalone"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "webrtc-ci"
+          dataset: "resultdb"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_rel_reclient"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.webrtc.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4923,6 +5223,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -4970,6 +5274,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5017,6 +5325,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5064,6 +5376,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5111,6 +5427,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5157,6 +5477,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5203,6 +5527,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5249,6 +5577,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5295,6 +5627,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5341,6 +5677,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5387,6 +5727,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5433,6 +5777,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5479,6 +5827,60 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.webrtc",'
+        '  "recipe": "webrtc/standalone"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "webrtc-ci"
+          dataset: "resultdb"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_rel_reclient"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.webrtc.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5526,6 +5928,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5575,6 +5981,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5623,6 +6033,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5671,6 +6085,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5718,6 +6136,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5765,6 +6187,61 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.webrtc",'
+        '  "recipe": "webrtc/standalone"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "webrtc-ci"
+          dataset: "resultdb"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win_compile_x64_clang_rel_reclient"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.webrtc.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5812,6 +6289,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5859,6 +6340,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5906,6 +6391,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -5953,6 +6442,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -6000,6 +6493,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -6047,6 +6544,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
@@ -6094,6 +6595,10 @@
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
         '  "$recipe_engine/resultdb/test_presentation": {'
         '    "column_keys": [],'
         '    "grouping_keys": ['
diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg
index 08bf4fb..d8cb107 100644
--- a/infra/config/luci-milo.cfg
+++ b/infra/config/luci-milo.cfg
@@ -466,6 +466,9 @@
     name: "buildbucket/luci.webrtc.try/android_arm_rel"
   }
   builders {
+    name: "buildbucket/luci.webrtc.try/android_arm_rel_reclient"
+  }
+  builders {
     name: "buildbucket/luci.webrtc.try/android_compile_arm_rel"
   }
   builders {
@@ -505,6 +508,9 @@
     name: "buildbucket/luci.webrtc.try/ios_compile_arm64_rel"
   }
   builders {
+    name: "buildbucket/luci.webrtc.try/ios_compile_arm64_rel_reclient"
+  }
+  builders {
     name: "buildbucket/luci.webrtc.try/ios_sim_x64_dbg_ios14"
   }
   builders {
@@ -532,6 +538,9 @@
     name: "buildbucket/luci.webrtc.try/linux_rel"
   }
   builders {
+    name: "buildbucket/luci.webrtc.try/linux_rel_reclient"
+  }
+  builders {
     name: "buildbucket/luci.webrtc.try/linux_compile_rel"
   }
   builders {
@@ -589,6 +598,9 @@
     name: "buildbucket/luci.webrtc.try/mac_rel"
   }
   builders {
+    name: "buildbucket/luci.webrtc.try/mac_rel_reclient"
+  }
+  builders {
     name: "buildbucket/luci.webrtc.try/mac_compile_rel"
   }
   builders {
@@ -628,6 +640,9 @@
     name: "buildbucket/luci.webrtc.try/win_compile_x64_clang_rel"
   }
   builders {
+    name: "buildbucket/luci.webrtc.try/win_compile_x64_clang_rel_reclient"
+  }
+  builders {
     name: "buildbucket/luci.webrtc.try/win_asan"
   }
   builders {
diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg
index c4fb2aa..c903891 100644
--- a/infra/config/luci-notify.cfg
+++ b/infra/config/luci-notify.cfg
@@ -1622,6 +1622,19 @@
   }
   builders {
     bucket: "try"
+    name: "android_arm_rel_reclient"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "infra_failure"
+  }
+  builders {
+    bucket: "try"
     name: "android_chromium_compile"
   }
 }
@@ -1791,6 +1804,19 @@
   }
   builders {
     bucket: "try"
+    name: "ios_compile_arm64_rel_reclient"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "infra_failure"
+  }
+  builders {
+    bucket: "try"
     name: "ios_sim_x64_dbg_ios12"
   }
 }
@@ -2025,6 +2051,19 @@
   }
   builders {
     bucket: "try"
+    name: "linux_rel_reclient"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "infra_failure"
+  }
+  builders {
+    bucket: "try"
     name: "linux_tsan2"
   }
 }
@@ -2194,6 +2233,19 @@
   }
   builders {
     bucket: "try"
+    name: "mac_rel_reclient"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "infra_failure"
+  }
+  builders {
+    bucket: "try"
     name: "presubmit"
   }
 }
@@ -2272,6 +2324,19 @@
   }
   builders {
     bucket: "try"
+    name: "win_compile_x64_clang_rel_reclient"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "infra_failure"
+  }
+  builders {
+    bucket: "try"
     name: "win_compile_x86_clang_dbg"
   }
 }
diff --git a/infra/config/project.cfg b/infra/config/project.cfg
index ef07d89..d35a697 100644
--- a/infra/config/project.cfg
+++ b/infra/config/project.cfg
@@ -7,7 +7,7 @@
 name: "webrtc"
 access: "group:all"
 lucicfg {
-  version: "1.33.7"
+  version: "1.35.2"
   package_dir: "."
   config_dir: "."
   entry_point: "config.star"