BASELINE: Update Chromium to 92.0.4515.166

Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364

42 files changed, 8642 insertions, 1705 deletions

diff --git a/chromium/infra/config/DIR_METADATA b/chromium/infra/config/DIR_METADATA
deleted file mode 100644
index d2d9af5936b..00000000000
--- a/chromium/infra/config/DIR_METADATA
+++ /dev/null
@@ -1,12 +0,0 @@
-# Metadata information for this directory.
-#
-# For more information on DIR_METADATA files, see:
-#   https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/README.md
-#
-# For the schema of this file, see Metadata message:
-#   https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/proto/dir_metadata.proto
-
-monorail {
-  component: "Infra>Client>Chrome"
-}
-team_email: "infra-dev@chromium.org"
\ No newline at end of file
diff --git a/chromium/infra/config/OWNERS b/chromium/infra/config/OWNERS
new file mode 100644
index 00000000000..6d47884255a
--- /dev/null
+++ b/chromium/infra/config/OWNERS
@@ -0,0 +1,6 @@
+# iOS owners for changing Xcode constants only.
+per-file lib/builders.star=file://infra/config/groups/ios/OWNERS
+
+# iOS owners for builder configs.
+per-file subprojects/chromium/ci.star=file://infra/config/groups/ios/OWNERS
+per-file subprojects/chromium/try.star=file://infra/config/groups/ios/OWNERS
diff --git a/chromium/infra/config/console-header.star b/chromium/infra/config/console-header.star
index f88047c62fb..2c967f90713 100644
--- a/chromium/infra/config/console-header.star
+++ b/chromium/infra/config/console-header.star
@@ -23,7 +23,7 @@ HEADER = headers.header(
         ),
         headers.oncall(
             name = "iOS",
-            url = "https://chrome-ops-rotation-proxy.appspot.com/current/grotation:chrome-ios-build-sheriff",
+            url = "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ios",
         ),
         headers.oncall(
             name = "ChromeOS",
@@ -31,7 +31,7 @@ HEADER = headers.header(
         ),
         headers.oncall(
             name = "GPU",
-            url = "https://chrome-ops-rotation-proxy.appspot.com/current/grotation:chrome-gpu-pixel-wrangling",
+            url = "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-gpu-pixel-wrangler",
         ),
         headers.oncall(
             name = "ANGLE",
@@ -105,8 +105,10 @@ HEADER = headers.header(
                     text = "source",
                     branch_selector = branches.ALL_BRANCHES,
                     url = branches.value(
-                        for_main = "https://chromium.googlesource.com/chromium/src",
-                        for_branches = "https://chromium.googlesource.com/chromium/src/+/{}".format(settings.ref),
+                        {
+                            branches.MAIN: "https://chromium.googlesource.com/chromium/src",
+                        },
+                        default = "https://chromium.googlesource.com/chromium/src/+/{}".format(settings.ref),
                     ),
                     alt = "Chromium source code repository",
                 ),
@@ -350,5 +352,5 @@ HEADER = headers.header(
             ]],
         ),
     ],
-    tree_status_host = branches.value(for_main = "chromium-status.appspot.com"),
+    tree_status_host = "chromium-status.appspot.com" if settings.is_main else None,
 )
diff --git a/chromium/infra/config/dev.star b/chromium/infra/config/dev.star
index bc5ecd8eede..315917fa10e 100755
--- a/chromium/infra/config/dev.star
+++ b/chromium/infra/config/dev.star
@@ -9,7 +9,7 @@
 load("//lib/branches.star", "branches")
 
 lucicfg.check_version(
-    min = "1.19.0",
+    min = "1.27.0",
     message = "Update depot_tools",
 )
 
diff --git a/chromium/infra/config/dev/dev.star b/chromium/infra/config/dev/dev.star
index b0c7de431fe..767e20f6dbf 100644
--- a/chromium/infra/config/dev/dev.star
+++ b/chromium/infra/config/dev/dev.star
@@ -63,6 +63,7 @@ luci.builder.defaults.experiments.set({
     # Enable resultsink for dev swarming tasks.
     "chromium.resultdb.result_sink": 100,
 })
+luci.builder.defaults.test_presentation.set(resultdb.test_presentation(grouping_keys = ["status", "v.test_suite"]))
 
 exec("//dev/swarming.star")
 
diff --git a/chromium/infra/config/dev/subprojects/chromium/ci.star b/chromium/infra/config/dev/subprojects/chromium/ci.star
index d9f1191f9eb..9990b42ea41 100644
--- a/chromium/infra/config/dev/subprojects/chromium/ci.star
+++ b/chromium/infra/config/dev/subprojects/chromium/ci.star
@@ -42,7 +42,7 @@ defaults.builderless.set(None)
 defaults.cpu.set(cpu.X86_64)
 defaults.executable.set(luci.recipe(name = "swarming/staging"))
 defaults.execution_timeout.set(3 * time.hour)
-defaults.os.set(os.LINUX_DEFAULT)
+defaults.os.set(os.LINUX_BIONIC_SWITCH_TO_DEFAULT)
 defaults.service_account.set(
     "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com",
 )
@@ -61,6 +61,7 @@ def ci_builder(*, name, resultdb_bigquery_exports = None, **kwargs):
         resultdb_bigquery_exports = resultdb_bigquery_exports,
         isolated_server = "https://isolateserver-dev.appspot.com",
         goma_backend = goma.backend.RBE_PROD,
+        resultdb_index_by_timestamp = True,
         **kwargs
     )
 
@@ -90,6 +91,7 @@ ci_builder(
 ci_builder(
     name = "win-rel-swarming",
     os = os.WINDOWS_DEFAULT,
+    goma_enable_ats = True,
 )
 
 ## builders using swarming staging instance
@@ -107,4 +109,5 @@ ci_builder_staging(
 ci_builder_staging(
     name = "win-rel-swarming-staging",
     os = os.WINDOWS_DEFAULT,
+    goma_enable_ats = True,
 )
diff --git a/chromium/infra/config/generated/commit-queue.cfg b/chromium/infra/config/generated/commit-queue.cfg
index 7f02cefd96e..0a98cf3b1c7 100644
--- a/chromium/infra/config/generated/commit-queue.cfg
+++ b/chromium/infra/config/generated/commit-queue.cfg
@@ -17,7 +17,7 @@ config_groups {
     url: "https://chromium-review.googlesource.com"
     projects {
       name: "chromium/src"
-      ref_regexp: "refs/branch-heads/4472"
+      ref_regexp: "refs/branch-heads/4515"
     }
   }
   verifiers {
@@ -27,61 +27,61 @@ config_groups {
     }
     tryjob {
       builders {
-        name: "chrome-m91/try/linux-chrome"
+        name: "chrome-m92/try/linux-chrome"
         includable_only: true
         owner_whitelist_group: "googlers"
         owner_whitelist_group: "project-chromium-robot-committers"
       }
       builders {
-        name: "chrome-m91/try/linux-chrome-stable"
+        name: "chrome-m92/try/linux-chrome-stable"
         includable_only: true
         owner_whitelist_group: "googlers"
         owner_whitelist_group: "project-chromium-robot-committers"
       }
       builders {
-        name: "chrome-m91/try/mac-chrome"
+        name: "chrome-m92/try/mac-chrome"
         includable_only: true
         owner_whitelist_group: "googlers"
         owner_whitelist_group: "project-chromium-robot-committers"
       }
       builders {
-        name: "chrome-m91/try/mac-chrome-stable"
+        name: "chrome-m92/try/mac-chrome-stable"
         includable_only: true
         owner_whitelist_group: "googlers"
         owner_whitelist_group: "project-chromium-robot-committers"
       }
       builders {
-        name: "chrome-m91/try/win-chrome"
+        name: "chrome-m92/try/win-chrome"
         includable_only: true
         owner_whitelist_group: "googlers"
         owner_whitelist_group: "project-chromium-robot-committers"
       }
       builders {
-        name: "chrome-m91/try/win-chrome-stable"
+        name: "chrome-m92/try/win-chrome-stable"
         includable_only: true
         owner_whitelist_group: "googlers"
         owner_whitelist_group: "project-chromium-robot-committers"
       }
       builders {
-        name: "chrome-m91/try/win64-chrome"
+        name: "chrome-m92/try/win64-chrome"
         includable_only: true
         owner_whitelist_group: "googlers"
         owner_whitelist_group: "project-chromium-robot-committers"
       }
       builders {
-        name: "chrome-m91/try/win64-chrome-stable"
+        name: "chrome-m92/try/win64-chrome-stable"
         includable_only: true
         owner_whitelist_group: "googlers"
         owner_whitelist_group: "project-chromium-robot-committers"
       }
       builders {
-        name: "chromium-m91/try/android-binary-size"
+        name: "chromium-m92/try/android-binary-size"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/android-cronet-arm-dbg"
+        name: "chromium-m92/try/android-cronet-arm-dbg"
         location_regexp: ".+/[+]/components/cronet/.+"
         location_regexp: ".+/[+]/components/grpc_support/.+"
         location_regexp: ".+/[+]/build/android/.+"
@@ -91,29 +91,29 @@ config_groups {
         location_regexp_exclude: ".+/[+]/components/cronet/ios/.+"
       }
       builders {
-        name: "chromium-m91/try/android-lollipop-arm-rel"
+        name: "chromium-m92/try/android-lollipop-arm-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/android-marshmallow-arm64-rel"
+        name: "chromium-m92/try/android-marshmallow-arm64-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/android-marshmallow-x86-rel"
+        name: "chromium-m92/try/android-marshmallow-x86-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/android-official"
+        name: "chromium-m92/try/android-official"
         includable_only: true
       }
       builders {
-        name: "chromium-m91/try/android-pie-arm64-dbg"
+        name: "chromium-m92/try/android-pie-arm64-dbg"
         location_regexp: ".+/[+]/chrome/android/features/vr/.+"
         location_regexp: ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/chrome/android/javatests/src/org/chromium/chrome/browser/vr/.+"
@@ -128,19 +128,19 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/android-pie-arm64-rel"
+        name: "chromium-m92/try/android-pie-arm64-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/android_compile_dbg"
+        name: "chromium-m92/try/android_compile_dbg"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/android_compile_x64_dbg"
+        name: "chromium-m92/try/android_compile_x64_dbg"
         location_regexp: ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
@@ -153,7 +153,7 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/android_compile_x86_dbg"
+        name: "chromium-m92/try/android_compile_x86_dbg"
         location_regexp: ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
@@ -166,13 +166,13 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/android_cronet"
+        name: "chromium-m92/try/android_cronet"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/android_optional_gpu_tests_rel"
+        name: "chromium-m92/try/android_optional_gpu_tests_rel"
         location_regexp: ".+/[+]/cc/.+"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
@@ -180,11 +180,17 @@ config_groups {
         location_regexp: ".+/[+]/content/test/gpu/.+"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/media/audio/.+"
+        location_regexp: ".+/[+]/media/base/.+"
+        location_regexp: ".+/[+]/media/capture/.+"
         location_regexp: ".+/[+]/media/filters/.+"
         location_regexp: ".+/[+]/media/gpu/.+"
+        location_regexp: ".+/[+]/media/mojo/.+"
         location_regexp: ".+/[+]/media/renderers/.+"
+        location_regexp: ".+/[+]/media/video/.+"
         location_regexp: ".+/[+]/services/viz/.+"
         location_regexp: ".+/[+]/testing/trigger_scripts/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/mediastream/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webcodecs/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
         location_regexp: ".+/[+]/tools/clang/scripts/update.py"
@@ -193,38 +199,44 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/cast_shell_android"
+        name: "chromium-m92/try/cast_shell_android"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/cast_shell_linux"
+        name: "chromium-m92/try/cast_shell_linux"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/chromeos-amd64-generic-dbg"
+        name: "chromium-m92/try/cast_shell_linux_dbg"
+        location_regexp: ".+/[+]/chromecast/.+"
+        location_regexp_exclude: ".+/[+]/docs/.+"
+        location_regexp_exclude: ".+/[+]/infra/config/.+"
+      }
+      builders {
+        name: "chromium-m92/try/chromeos-amd64-generic-dbg"
         location_regexp: ".+/[+]/content/gpu/.+"
         location_regexp: ".+/[+]/media/.+"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/chromeos-amd64-generic-rel"
+        name: "chromium-m92/try/chromeos-amd64-generic-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/chromeos-arm-generic-rel"
+        name: "chromium-m92/try/chromeos-arm-generic-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/chromeos-kevin-rel"
+        name: "chromium-m92/try/chromeos-kevin-rel"
         location_regexp: ".+/[+]/build/chromeos/.+"
         location_regexp: ".+/[+]/build/config/chromeos/.*"
         location_regexp: ".+/[+]/chromeos/CHROMEOS_LKGM"
@@ -232,11 +244,11 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/chromium_presubmit"
+        name: "chromium-m92/try/chromium_presubmit"
         disable_reuse: true
       }
       builders {
-        name: "chromium-m91/try/dawn-linux-x64-deps-rel"
+        name: "chromium-m92/try/dawn-linux-x64-deps-rel"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
@@ -251,7 +263,7 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/dawn-mac-x64-deps-rel"
+        name: "chromium-m92/try/dawn-mac-x64-deps-rel"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
@@ -266,7 +278,7 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/dawn-win10-x64-deps-rel"
+        name: "chromium-m92/try/dawn-win10-x64-deps-rel"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
@@ -281,7 +293,7 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/dawn-win10-x86-deps-rel"
+        name: "chromium-m92/try/dawn-win10-x86-deps-rel"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
@@ -296,41 +308,41 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/fuchsia-arm64-cast"
+        name: "chromium-m92/try/fuchsia-arm64-cast"
         location_regexp: ".+/[+]/chromecast/.+"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/fuchsia-official"
+        name: "chromium-m92/try/fuchsia-official"
         includable_only: true
       }
       builders {
-        name: "chromium-m91/try/fuchsia-x64-cast"
+        name: "chromium-m92/try/fuchsia-x64-cast"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/fuchsia_arm64"
+        name: "chromium-m92/try/fuchsia_arm64"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/fuchsia_x64"
+        name: "chromium-m92/try/fuchsia_x64"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/ios-simulator"
+        name: "chromium-m92/try/ios-simulator"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/ios-simulator-cronet"
+        name: "chromium-m92/try/ios-simulator-cronet"
         location_regexp: ".+/[+]/components/cronet/.+"
         location_regexp: ".+/[+]/components/grpc_support/.+"
         location_regexp: ".+/[+]/ios/.+"
@@ -339,13 +351,13 @@ config_groups {
         location_regexp_exclude: ".+/[+]/components/cronet/android/.+"
       }
       builders {
-        name: "chromium-m91/try/ios-simulator-full-configs"
+        name: "chromium-m92/try/ios-simulator-full-configs"
         location_regexp: ".+/[+]/ios/.+"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux-blink-rel"
+        name: "chromium-m92/try/linux-blink-rel"
         location_regexp: ".+/[+]/cc/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/paint/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/svg/.+"
@@ -354,80 +366,84 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux-chromeos-compile-dbg"
+        name: "chromium-m92/try/linux-chromeos-compile-dbg"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux-chromeos-rel"
+        name: "chromium-m92/try/linux-chromeos-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux-libfuzzer-asan-rel"
+        name: "chromium-m92/try/linux-libfuzzer-asan-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux-official"
+        name: "chromium-m92/try/linux-official"
         includable_only: true
       }
       builders {
-        name: "chromium-m91/try/linux-ozone-rel"
+        name: "chromium-m92/try/linux-ozone-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux-rel"
+        name: "chromium-m92/try/linux-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux-rel-compilator"
+        name: "chromium-m92/try/linux-rel-compilator"
         includable_only: true
       }
       builders {
-        name: "chromium-m91/try/linux-rel-orchestrator"
+        name: "chromium-m92/try/linux-rel-orchestrator"
         includable_only: true
       }
       builders {
-        name: "chromium-m91/try/linux-rel-reclient"
+        name: "chromium-m92/try/linux-rel-reclient"
         experiment_percentage: 10
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux_chromium_asan_rel_ng"
+        name: "chromium-m92/try/linux_chromium_asan_rel_ng"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux_chromium_compile_dbg_ng"
+        name: "chromium-m92/try/linux_chromium_compile_dbg_ng"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux_chromium_dbg_ng"
+        name: "chromium-m92/try/linux_chromium_dbg_ng"
         location_regexp: ".+/[+]/build/.*check_gn_headers.*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux_chromium_tsan_rel_ng"
+        name: "chromium-m92/try/linux_chromium_tsan_rel_ng"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux_layout_tests_composite_after_paint"
+        name: "chromium-m92/try/linux_chromium_tsan_rel_ng_bionic"
+        includable_only: true
+      }
+      builders {
+        name: "chromium-m92/try/linux_layout_tests_composite_after_paint"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/paint/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/svg/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/.+"
@@ -436,7 +452,7 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux_layout_tests_layout_ng_disabled"
+        name: "chromium-m92/try/linux_layout_tests_layout_ng_disabled"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/editing/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/layout/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/paint/.+"
@@ -449,17 +465,23 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux_optional_gpu_tests_rel"
+        name: "chromium-m92/try/linux_optional_gpu_tests_rel"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
         location_regexp: ".+/[+]/content/test/gpu/.+"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/media/audio/.+"
+        location_regexp: ".+/[+]/media/base/.+"
+        location_regexp: ".+/[+]/media/capture/.+"
         location_regexp: ".+/[+]/media/filters/.+"
         location_regexp: ".+/[+]/media/gpu/.+"
+        location_regexp: ".+/[+]/media/mojo/.+"
         location_regexp: ".+/[+]/media/renderers/.+"
+        location_regexp: ".+/[+]/media/video/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.gpu.fyi.json"
         location_regexp: ".+/[+]/testing/trigger_scripts/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/mediastream/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webcodecs/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
         location_regexp: ".+/[+]/tools/clang/scripts/update.py"
@@ -468,45 +490,51 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/linux_vr"
+        name: "chromium-m92/try/linux_vr"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/mac-arm64-rel"
+        name: "chromium-m92/try/mac-arm64-rel"
         includable_only: true
       }
       builders {
-        name: "chromium-m91/try/mac-official"
+        name: "chromium-m92/try/mac-official"
         includable_only: true
       }
       builders {
-        name: "chromium-m91/try/mac-rel"
+        name: "chromium-m92/try/mac-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/mac_chromium_compile_dbg_ng"
+        name: "chromium-m92/try/mac_chromium_compile_dbg_ng"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/mac_optional_gpu_tests_rel"
+        name: "chromium-m92/try/mac_optional_gpu_tests_rel"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
         location_regexp: ".+/[+]/content/test/gpu/.+"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/media/audio/.+"
+        location_regexp: ".+/[+]/media/base/.+"
+        location_regexp: ".+/[+]/media/capture/.+"
         location_regexp: ".+/[+]/media/filters/.+"
         location_regexp: ".+/[+]/media/gpu/.+"
+        location_regexp: ".+/[+]/media/mojo/.+"
         location_regexp: ".+/[+]/media/renderers/.+"
+        location_regexp: ".+/[+]/media/video/.+"
         location_regexp: ".+/[+]/services/shape_detection/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.gpu.fyi.json"
         location_regexp: ".+/[+]/testing/trigger_scripts/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/mediastream/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webcodecs/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
         location_regexp: ".+/[+]/tools/clang/scripts/update.py"
@@ -515,51 +543,57 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/win-libfuzzer-asan-rel"
+        name: "chromium-m92/try/win-libfuzzer-asan-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/win-official"
+        name: "chromium-m92/try/win-official"
         includable_only: true
       }
       builders {
-        name: "chromium-m91/try/win10_chromium_x64_rel_ng"
+        name: "chromium-m92/try/win10_chromium_x64_rel_ng"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/win32-official"
+        name: "chromium-m92/try/win32-official"
         includable_only: true
       }
       builders {
-        name: "chromium-m91/try/win7-rel"
+        name: "chromium-m92/try/win7-rel"
         location_regexp: ".+/[+]/sandbox/win/.+"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/win_chromium_compile_dbg_ng"
+        name: "chromium-m92/try/win_chromium_compile_dbg_ng"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m91/try/win_optional_gpu_tests_rel"
+        name: "chromium-m92/try/win_optional_gpu_tests_rel"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
         location_regexp: ".+/[+]/content/test/gpu/.+"
         location_regexp: ".+/[+]/device/vr/.+"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/media/audio/.+"
+        location_regexp: ".+/[+]/media/base/.+"
+        location_regexp: ".+/[+]/media/capture/.+"
         location_regexp: ".+/[+]/media/filters/.+"
         location_regexp: ".+/[+]/media/gpu/.+"
+        location_regexp: ".+/[+]/media/mojo/.+"
         location_regexp: ".+/[+]/media/renderers/.+"
+        location_regexp: ".+/[+]/media/video/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.gpu.fyi.json"
         location_regexp: ".+/[+]/testing/trigger_scripts/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/vr/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/mediastream/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webcodecs/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/xr/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
diff --git a/chromium/infra/config/generated/cr-buildbucket.cfg b/chromium/infra/config/generated/cr-buildbucket.cfg
index e9a98c4ff34..aa328decd7e 100644
--- a/chromium/infra/config/generated/cr-buildbucket.cfg
+++ b/chromium/infra/config/generated/cr-buildbucket.cfg
@@ -15,6 +15,10 @@ buckets {
   }
   acls {
     role: SCHEDULER
+    identity: "user:chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acls {
+    role: SCHEDULER
     group: "project-chromium-ci-schedulers"
   }
   swarming {
@@ -33,7 +37,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.gpu\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.gpu",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -62,12 +98,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -91,7 +133,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -120,12 +195,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -149,7 +230,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -178,12 +292,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -207,7 +327,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -236,12 +389,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -265,7 +424,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -294,12 +486,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -323,7 +521,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -352,12 +583,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -381,7 +618,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -414,12 +684,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -443,7 +719,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -472,12 +781,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -501,7 +816,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -530,12 +878,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -559,7 +913,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -588,12 +975,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -609,7 +1002,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -617,7 +1010,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":50,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 50,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -646,12 +1072,115 @@ buckets {
           test_results {}
         }
         bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
+    builders {
+      name: "Cast Linux Debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-18.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.gtests_local"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.junit_tests"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -675,7 +1204,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.dawn\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.dawn",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -704,12 +1265,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -733,7 +1300,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.dawn\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.dawn",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -762,12 +1355,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -791,7 +1390,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.dawn\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.dawn",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -820,12 +1445,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -847,11 +1478,46 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.dawn\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.dawn",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -876,12 +1542,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -905,7 +1577,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.dawn\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.dawn",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -934,12 +1632,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -963,7 +1667,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.dawn\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.dawn",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -992,12 +1722,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1021,11 +1757,47 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.dawn\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.dawn",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -1050,12 +1822,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1079,7 +1857,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.dawn\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.dawn",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1108,12 +1912,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1137,7 +1947,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.dawn\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.dawn",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1166,12 +2002,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1195,11 +2037,47 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.dawn\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.dawn",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -1224,12 +2102,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1253,7 +2137,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.dawn\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.dawn",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1282,12 +2192,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1311,7 +2227,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.dawn\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.dawn",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1340,12 +2282,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1361,7 +2309,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -1369,7 +2317,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1398,12 +2379,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1419,7 +2406,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -1427,7 +2414,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1456,12 +2476,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1485,7 +2511,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.gpu\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.gpu",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1514,12 +2572,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1541,11 +2605,46 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.gpu\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.gpu",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -1570,12 +2669,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1599,11 +2704,47 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.gpu\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.gpu",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -1628,12 +2769,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1657,7 +2804,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.memory\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.memory",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1686,12 +2866,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1715,7 +2901,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.memory\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.memory",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1744,12 +2963,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1773,7 +2998,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.memory\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.memory",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1802,12 +3060,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1823,7 +3087,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -1831,7 +3095,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1864,12 +3161,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1885,7 +3188,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -1893,7 +3196,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1922,12 +3258,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -1943,7 +3285,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -1951,7 +3293,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1980,12 +3355,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2001,7 +3382,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -2009,7 +3390,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2038,12 +3452,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2059,7 +3479,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -2067,7 +3487,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2096,12 +3549,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2125,7 +3584,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.gpu\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.gpu",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2154,12 +3639,115 @@ buckets {
           test_results {}
         }
         bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
+    builders {
+      name: "Linux TSan (bionic)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-18.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.memory",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.gtests_local"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.junit_tests"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2183,7 +3771,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.memory\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.memory",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2212,12 +3833,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2241,7 +3868,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.memory\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.memory",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2270,12 +3930,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2291,7 +3957,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -2299,7 +3965,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2328,12 +4027,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2349,7 +4054,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -2357,7 +4062,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2386,12 +4124,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2407,7 +4151,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -2415,7 +4159,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2444,12 +4221,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2465,7 +4248,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -2473,7 +4256,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"jobs\":500,\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2502,12 +4311,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2523,7 +4338,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -2531,7 +4346,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2560,12 +4408,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2587,13 +4441,44 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mac\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.mac",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
         key: "chromium.chromium_tests.use_rbe_cas"
-        value: 20
+        value: 50
       }
       experiments {
         key: "chromium.resultdb.result_sink"
@@ -2620,12 +4505,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2647,11 +4538,46 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mac\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.mac",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -2676,12 +4602,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2705,7 +4637,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.gpu\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.gpu",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2734,12 +4692,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2763,7 +4727,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.gpu\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.gpu",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2792,12 +4782,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2821,7 +4817,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mac\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.mac",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2850,12 +4872,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2879,7 +4907,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mac\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.mac",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2908,12 +4962,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2937,7 +4997,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mac\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.mac",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2966,12 +5052,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -2995,7 +5087,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mac\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.mac",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3024,12 +5142,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3053,7 +5177,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mac\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.mac",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3082,12 +5232,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3111,7 +5267,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mac\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.mac",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3140,12 +5322,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3169,7 +5357,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3198,12 +5419,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3227,7 +5454,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3256,12 +5516,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3285,7 +5551,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3314,12 +5613,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3343,7 +5648,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.fyi",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 36000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3372,12 +5709,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3401,7 +5744,38 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$build/reclient\":{\"instance\":\"goma-rbe-chromium\",\"metrics_project\":\"chromium-reclient-metrics\"},\"$kitchen\":{\"devshell\":true,\"emulate_gce\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/reclient": {'
+        '    "instance": "goma-rbe-chromium",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "emulate_gce": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.fyi",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 36000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3430,12 +5804,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3459,11 +5839,47 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.win\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.win",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -3488,12 +5904,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3516,11 +5938,47 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.win\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.win",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -3545,12 +6003,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3573,7 +6037,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.win\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.win",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3606,12 +6102,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3634,11 +6136,47 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.win\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.win",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -3663,12 +6201,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3692,7 +6236,33 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.gpu\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.gpu",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3721,12 +6291,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3750,11 +6326,47 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.win\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.win",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -3779,12 +6391,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3808,7 +6426,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3837,12 +6488,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3866,7 +6523,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3895,12 +6585,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3924,7 +6620,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3953,12 +6682,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -3982,7 +6717,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4011,12 +6779,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4040,7 +6814,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4069,12 +6876,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4098,7 +6911,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4127,12 +6973,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4156,7 +7008,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4185,12 +7070,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4214,7 +7105,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4243,12 +7167,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4271,7 +7201,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 25200
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4300,12 +7262,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4329,7 +7297,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4358,12 +7359,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4387,7 +7394,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4416,12 +7456,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4445,7 +7491,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.chromiumos\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.chromiumos",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4474,12 +7552,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4503,7 +7587,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.chromiumos\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.chromiumos",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4532,12 +7648,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4561,7 +7683,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.chromiumos\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.chromiumos",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4590,12 +7744,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4619,7 +7779,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.chromiumos\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.chromiumos",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4648,12 +7840,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4677,7 +7875,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.chromiumos\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.chromiumos",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4706,12 +7936,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4727,7 +7963,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -4735,7 +7971,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4764,12 +8033,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4793,7 +8068,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 36000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4822,12 +8129,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4843,7 +8156,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -4851,7 +8164,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -4880,12 +8226,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4907,7 +8259,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mac\",\"recipe\":\"chromium\",\"xcode_build_version\":\"12d4e\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.mac",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ],'
+        '  "xcode_build_version": "12d4e"'
+        '}'
       execution_timeout_secs: 10800
       caches {
         name: "xcode_ios_12d4e"
@@ -4916,6 +8300,10 @@ buckets {
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -4940,12 +8328,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -4967,7 +8361,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"12d4e\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.fyi",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ],'
+        '  "xcode_build_version": "12d4e"'
+        '}'
       execution_timeout_secs: 36000
       caches {
         name: "xcode_ios_12d4e"
@@ -4976,6 +8402,10 @@ buckets {
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -5000,12 +8430,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5027,7 +8463,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mac\",\"recipe\":\"chromium\",\"xcode_build_version\":\"12d4e\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.mac",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ],'
+        '  "xcode_build_version": "12d4e"'
+        '}'
       execution_timeout_secs: 10800
       caches {
         name: "xcode_ios_12d4e"
@@ -5036,6 +8504,10 @@ buckets {
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -5060,12 +8532,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5089,7 +8567,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.chromiumos\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.chromiumos",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -5118,12 +8628,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5147,7 +8663,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.chromiumos\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.chromiumos",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -5176,12 +8724,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5205,7 +8759,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.chromiumos\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.chromiumos",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -5234,12 +8820,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5263,7 +8855,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.chromiumos\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.chromiumos",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -5292,12 +8916,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5320,7 +8950,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 36000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -5349,12 +9011,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5370,7 +9038,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
       exe {
@@ -5378,7 +9046,40 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 500,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.linux",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -5407,12 +9108,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5434,11 +9141,46 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mac\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium.mac",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -5463,12 +9205,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5491,11 +9239,47 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 25200
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -5520,12 +9304,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5548,11 +9338,47 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium\",\"recipe\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$build/chromium_tests": {'
+        '    "project_trigger_overrides": {'
+        '      "chromium": "chromium-m92"'
+        '    }'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "chromium",'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
       execution_timeout_secs: 25200
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -5577,12 +9403,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_ci_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5630,7 +9462,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-18.04"
+      dimensions: "os:Ubuntu-16.04|Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -5638,7 +9470,46 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/binary_size\":{\"analyze_targets\":[\"//chrome/android:monochrome_public_minimal_apks\",\"//chrome/android:trichrome_minimal_apks\",\"//chrome/android:validate_expectations\",\"//tools/binary_size:binary_size_trybot_py\"],\"compile_targets\":[\"monochrome_public_minimal_apks\",\"monochrome_static_initializers\",\"trichrome_minimal_apks\",\"validate_expectations\"]},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"binary_size_trybot\"}"
+      properties:
+        '{'
+        '  "$build/binary_size": {'
+        '    "analyze_targets": ['
+        '      "//chrome/android:monochrome_public_minimal_apks",'
+        '      "//chrome/android:trichrome_minimal_apks",'
+        '      "//chrome/android:validate_expectations",'
+        '      "//tools/binary_size:binary_size_trybot_py"'
+        '    ],'
+        '    "compile_targets": ['
+        '      "monochrome_public_minimal_apks",'
+        '      "monochrome_static_initializers",'
+        '      "trichrome_minimal_apks",'
+        '      "validate_expectations"'
+        '    ]'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.android",'
+        '  "recipe": "binary_size_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -5674,12 +9545,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5703,7 +9580,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.android",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -5739,12 +9640,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5760,7 +9667,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-18.04"
+      dimensions: "os:Ubuntu-16.04|Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -5768,7 +9675,32 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.android",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -5804,12 +9736,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5825,7 +9763,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:16"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-18.04"
+      dimensions: "os:Ubuntu-16.04|Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {
@@ -5833,7 +9771,35 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/code_coverage\":{\"use_java_coverage\":true},\"$build/goma\":{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/code_coverage": {'
+        '    "use_java_coverage": true'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 300,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.android",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -5869,12 +9835,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5890,7 +9862,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:16"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-18.04"
+      dimensions: "os:Ubuntu-16.04|Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {
@@ -5898,7 +9870,32 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 300,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.android",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -5934,12 +9931,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -5963,7 +9966,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -5999,12 +10026,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6027,7 +10060,32 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 300,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.android",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -6063,12 +10121,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6084,7 +10148,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:16"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-18.04"
+      dimensions: "os:Ubuntu-16.04|Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {
@@ -6092,7 +10156,32 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 300,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.android",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -6128,12 +10217,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6149,7 +10244,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-18.04"
+      dimensions: "os:Ubuntu-16.04|Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -6157,7 +10252,32 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.android",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -6193,12 +10313,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6222,7 +10348,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.android",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -6258,12 +10408,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6287,7 +10443,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.android",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -6323,12 +10503,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6344,7 +10530,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-18.04"
+      dimensions: "os:Ubuntu-16.04|Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -6352,7 +10538,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.android",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -6388,12 +10598,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6416,7 +10632,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.android",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 21600
       expiration_secs: 7200
       grace_period {
@@ -6452,12 +10692,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6473,7 +10719,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-18.04"
+      dimensions: "os:Ubuntu-16.04|Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -6481,7 +10727,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.android",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -6517,12 +10787,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6538,7 +10814,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -6546,7 +10822,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -6582,12 +10882,113 @@ buckets {
           test_results {}
         }
         bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
+    builders {
+      name: "cast_shell_linux_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-18.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      grace_period {
+        seconds: 120
+      }
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.junit_tests"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6611,7 +11012,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.chromiumos\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.chromiumos",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -6647,12 +11072,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6676,7 +11107,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.chromiumos\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.chromiumos",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -6712,12 +11167,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6741,7 +11202,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.chromiumos\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.chromiumos",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -6777,12 +11262,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6806,7 +11297,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.chromiumos\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.chromiumos",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -6842,12 +11357,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6863,7 +11384,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -6871,7 +11392,30 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$depot_tools/presubmit\":{\"runhooks\":true,\"timeout_s\":480},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"presubmit\",\"repo_name\":\"chromium\"}"
+      properties:
+        '{'
+        '  "$depot_tools/presubmit": {'
+        '    "runhooks": true,'
+        '    "timeout_s": 480'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "presubmit",'
+        '  "repo_name": "chromium"'
+        '}'
       priority: 25
       execution_timeout_secs: 14400
       expiration_secs: 7200
@@ -6908,12 +11452,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6935,7 +11485,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.dawn\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.dawn",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -6971,12 +11545,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -6998,7 +11578,30 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.dawn\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.dawn",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7014,6 +11617,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -7034,12 +11641,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7061,7 +11674,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.dawn\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.dawn",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7077,6 +11714,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -7097,12 +11738,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7124,7 +11771,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.dawn\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.dawn",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7140,6 +11811,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -7160,12 +11835,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7181,7 +11862,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -7189,7 +11870,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7225,12 +11930,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7254,7 +11965,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7290,12 +12025,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7311,7 +12052,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -7319,7 +12060,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7355,12 +12120,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7376,7 +12147,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -7384,7 +12155,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7420,12 +12215,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7441,7 +12242,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -7449,7 +12250,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7485,12 +12310,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7512,7 +12343,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/code_coverage\":{\"coverage_exclude_sources\":\"ios_test_files_and_test_utils\",\"coverage_test_types\":[\"unit\"],\"use_clang_coverage\":true},\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\",\"xcode_build_version\":\"12d4e\"}"
+      properties:
+        '{'
+        '  "$build/code_coverage": {'
+        '    "coverage_exclude_sources": "ios_test_files_and_test_utils",'
+        '    "coverage_test_types": ['
+        '      "overall",'
+        '      "unit"'
+        '    ],'
+        '    "use_clang_coverage": true'
+        '  },'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.mac",'
+        '  "recipe": "chromium_trybot",'
+        '  "xcode_build_version": "12d4e"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7532,6 +12395,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -7552,12 +12419,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7579,7 +12452,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\",\"xcode_build_version\":\"12d4e\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.mac",'
+        '  "recipe": "chromium_trybot",'
+        '  "xcode_build_version": "12d4e"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7599,6 +12496,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -7619,12 +12520,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7646,7 +12553,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/code_coverage\":{\"coverage_exclude_sources\":\"ios_test_files_and_test_utils\",\"coverage_test_types\":[\"unit\"],\"use_clang_coverage\":true},\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\",\"xcode_build_version\":\"12d4e\"}"
+      properties:
+        '{'
+        '  "$build/code_coverage": {'
+        '    "coverage_exclude_sources": "ios_test_files_and_test_utils",'
+        '    "coverage_test_types": ['
+        '      "overall",'
+        '      "unit"'
+        '    ],'
+        '    "use_clang_coverage": true'
+        '  },'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.mac",'
+        '  "recipe": "chromium_trybot",'
+        '  "xcode_build_version": "12d4e"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7666,6 +12605,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -7686,12 +12629,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7707,7 +12656,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -7715,7 +12664,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.blink\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.blink",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7751,12 +12724,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7780,7 +12759,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.chromiumos\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.chromiumos",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7816,12 +12819,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7845,7 +12854,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/code_coverage\":{\"use_clang_coverage\":true},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.chromiumos\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/code_coverage": {'
+        '    "coverage_test_types": ['
+        '      "unit",'
+        '      "overall"'
+        '    ],'
+        '    "use_clang_coverage": true'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.chromiumos",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7881,12 +12922,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7902,7 +12949,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -7910,7 +12957,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_libfuzzer_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_libfuzzer_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -7946,12 +13017,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -7975,7 +13052,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8011,12 +13112,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8032,7 +13139,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -8040,7 +13147,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8076,12 +13207,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8097,7 +13234,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04|Ubuntu-18.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -8105,7 +13242,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/code_coverage\":{\"use_clang_coverage\":true},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/code_coverage": {'
+        '    "coverage_test_types": ['
+        '      "unit",'
+        '      "overall"'
+        '    ],'
+        '    "use_clang_coverage": true'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8141,12 +13310,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8162,7 +13337,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -8170,7 +13345,35 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/code_coverage\":{\"use_clang_coverage\":true},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium/compilator\"}"
+      properties:
+        '{'
+        '  "$build/code_coverage": {'
+        '    "use_clang_coverage": true'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium/compilator"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8206,12 +13409,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8227,7 +13436,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -8235,7 +13444,34 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/code_coverage\":{\"use_clang_coverage\":true},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium/orchestrator\"}"
+      properties:
+        '{'
+        '  "$build/code_coverage": {'
+        '    "use_clang_coverage": true'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium/orchestrator"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8271,12 +13507,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8292,7 +13534,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -8300,7 +13542,34 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/code_coverage\":{\"use_clang_coverage\":true},\"$build/goma\":{\"use_luci_auth\":true},\"$build/reclient\":{\"instance\":\"rbe-chromium-gvisor-shadow\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\"},\"$kitchen\":{\"devshell\":true,\"emulate_gce\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/code_coverage": {'
+        '    "use_clang_coverage": true'
+        '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-chromium-gvisor-shadow",'
+        '    "jobs": 150,'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "emulate_gce": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8336,12 +13605,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8365,7 +13640,32 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8401,12 +13701,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8422,7 +13728,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -8430,7 +13736,32 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8470,12 +13801,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8491,7 +13828,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -8499,7 +13836,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8539,12 +13900,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8568,7 +13935,32 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8604,12 +13996,114 @@ buckets {
           test_results {}
         }
         bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_tsan_rel_ng_bionic"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-18.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      grace_period {
+        seconds: 120
+      }
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.junit_tests"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8625,7 +14119,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -8633,7 +14127,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8669,12 +14187,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8690,7 +14214,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -8698,7 +14222,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8734,12 +14282,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8762,7 +14316,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 21600
       expiration_secs: 7200
       grace_period {
@@ -8798,12 +14376,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8819,7 +14403,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
       exe {
@@ -8827,7 +14411,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8863,12 +14471,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8891,7 +14505,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.mac",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8907,6 +14545,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -8927,12 +14569,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -8954,7 +14602,30 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -8970,6 +14641,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -8990,12 +14665,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -9018,7 +14699,34 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/code_coverage\":{\"use_clang_coverage\":true},\"$build/goma\":{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/code_coverage": {'
+        '    "use_clang_coverage": true'
+        '  },'
+        '  "$build/goma": {'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.mac",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -9034,6 +14742,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -9054,12 +14766,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -9082,7 +14800,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.mac",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -9098,6 +14840,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -9118,12 +14864,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -9145,7 +14897,30 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.mac",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 21600
       expiration_secs: 7200
       grace_period {
@@ -9161,6 +14936,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 50
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -9181,12 +14960,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -9209,7 +14994,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.win\",\"recipe\":\"chromium_libfuzzer_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.win",'
+        '  "recipe": "chromium_libfuzzer_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -9225,6 +15034,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -9245,12 +15058,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -9274,7 +15093,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 21600
       expiration_secs: 7200
       grace_period {
@@ -9290,6 +15133,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -9310,12 +15157,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -9339,7 +15192,39 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/code_coverage\":{\"use_clang_coverage\":true},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.win\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/code_coverage": {'
+        '    "coverage_test_types": ['
+        '      "unit",'
+        '      "overall"'
+        '    ],'
+        '    "use_clang_coverage": true'
+        '  },'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "jobs": 300,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.win",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -9355,6 +15240,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -9375,12 +15264,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -9404,7 +15299,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 21600
       expiration_secs: 7200
       grace_period {
@@ -9420,6 +15339,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -9440,12 +15363,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -9469,7 +15398,32 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.win\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "jobs": 300,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.win",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 16200
       expiration_secs: 7200
       grace_period {
@@ -9485,6 +15439,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -9505,12 +15463,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -9534,7 +15498,32 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.win\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "jobs": 150,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.win",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 14400
       expiration_secs: 7200
       grace_period {
@@ -9550,6 +15539,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -9570,12 +15563,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
@@ -9599,7 +15598,31 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.win\",\"recipe\":\"chromium_trybot\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$kitchen": {'
+        '    "devshell": true,'
+        '    "git_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.chromium.win",'
+        '  "recipe": "chromium_trybot"'
+        '}'
       execution_timeout_secs: 21600
       expiration_secs: 7200
       grace_period {
@@ -9615,6 +15638,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.chromium_tests.use_rbe_cas"
+        value: 20
+      }
+      experiments {
         key: "chromium.resultdb.result_sink"
         value: 100
       }
@@ -9635,12 +15662,18 @@ buckets {
           test_results {}
         }
         bq_exports {
-          project: "luci-resultdb"
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
           dataset: "chromium"
           table: "gpu_try_test_results"
           test_results {
             predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
             }
           }
         }
diff --git a/chromium/infra/config/generated/luci-milo.cfg b/chromium/infra/config/generated/luci-milo.cfg
index 0be51a56316..bb687fb9e23 100644
--- a/chromium/infra/config/generated/luci-milo.cfg
+++ b/chromium/infra/config/generated/luci-milo.cfg
@@ -6,476 +6,486 @@
 
 consoles {
   id: "main"
-  name: "Chromium M91 Main Console"
+  name: "Chromium M92 Main Console"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4472"
+  refs: "regexp:refs/branch-heads/4515"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-official"
+    name: "buildbucket/luci.chromium-m92.ci/android-official"
     category: "chromium|android"
     short_name: "off"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/fuchsia-official"
+    name: "buildbucket/luci.chromium-m92.ci/fuchsia-official"
     category: "chromium|fuchsia"
     short_name: "off"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/win32-official"
+    name: "buildbucket/luci.chromium-m92.ci/win32-official"
     category: "chromium|win|off"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/win-official"
+    name: "buildbucket/luci.chromium-m92.ci/win-official"
     category: "chromium|win|off"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win x64 Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Win x64 Builder"
     category: "chromium.win|release|builder"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win 7 Tests x64 (1)"
+    name: "buildbucket/luci.chromium-m92.ci/Win 7 Tests x64 (1)"
     category: "chromium.win|release|tester"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win10 Tests x64"
+    name: "buildbucket/luci.chromium-m92.ci/Win10 Tests x64"
     category: "chromium.win|release|tester"
     short_name: "w10"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Win Builder (dbg)"
     category: "chromium.win|debug|builder"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win7 Tests (dbg)(1)"
+    name: "buildbucket/luci.chromium-m92.ci/Win7 Tests (dbg)(1)"
     category: "chromium.win|debug|tester"
     short_name: "7"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Mac Builder"
     category: "chromium.mac|release"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.11 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.11 Tests"
     category: "chromium.mac|release"
     short_name: "11"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.12 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.12 Tests"
     category: "chromium.mac|release"
     short_name: "12"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.13 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.13 Tests"
     category: "chromium.mac|release"
     short_name: "13"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.14 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.14 Tests"
     category: "chromium.mac|release"
     short_name: "14"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.15 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.15 Tests"
     category: "chromium.mac|release"
     short_name: "15"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/mac-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.ci/mac-arm64-rel"
     category: "chromium.mac|release|arm64"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Mac Builder (dbg)"
     category: "chromium.mac|debug"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.15 Tests (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.15 Tests (dbg)"
     category: "chromium.mac|debug"
     short_name: "15"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/ios-simulator"
+    name: "buildbucket/luci.chromium-m92.ci/ios-simulator"
     category: "chromium.mac|ios|default"
     short_name: "sim"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/ios-simulator-full-configs"
+    name: "buildbucket/luci.chromium-m92.ci/ios-simulator-full-configs"
     category: "chromium.mac|ios|default"
     short_name: "ful"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Builder"
     category: "chromium.linux|release"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tests"
     category: "chromium.linux|release"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-ozone-rel"
+    name: "buildbucket/luci.chromium-m92.ci/linux-ozone-rel"
     category: "chromium.linux|release"
     short_name: "ozo"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tester (Ozone Headless)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tester (Ozone Headless)"
     category: "chromium.linux|release|ozone"
     short_name: "ltoh"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tester (Ozone Wayland)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tester (Ozone Wayland)"
     category: "chromium.linux|release|ozone"
     short_name: "ltow"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tester (Ozone X11)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tester (Ozone X11)"
     category: "chromium.linux|release|ozone"
     short_name: "ltox"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Builder (dbg)"
     category: "chromium.linux|debug|builder"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tests (dbg)(1)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tests (dbg)(1)"
     category: "chromium.linux|debug|tester"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Cast Linux"
+    name: "buildbucket/luci.chromium-m92.ci/Cast Linux"
     category: "chromium.linux|cast"
     short_name: "vid"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Fuchsia ARM64"
+    name: "buildbucket/luci.chromium-m92.ci/Cast Linux Debug"
+    category: "chromium.linux|cast"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m92.ci/Fuchsia ARM64"
     category: "chromium.linux|fuchsia|a64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/fuchsia-arm64-cast"
+    name: "buildbucket/luci.chromium-m92.ci/fuchsia-arm64-cast"
     category: "chromium.linux|fuchsia|cast"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/fuchsia-x64-cast"
+    name: "buildbucket/luci.chromium-m92.ci/fuchsia-x64-cast"
     category: "chromium.linux|fuchsia|cast"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Fuchsia x64"
+    name: "buildbucket/luci.chromium-m92.ci/Fuchsia x64"
     category: "chromium.linux|fuchsia|x64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-chromeos-rel"
+    name: "buildbucket/luci.chromium-m92.ci/linux-chromeos-rel"
     category: "chromium.chromiumos|default"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-chromeos-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/linux-chromeos-dbg"
     category: "chromium.chromiumos|default"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-lacros-builder-rel"
+    name: "buildbucket/luci.chromium-m92.ci/linux-lacros-builder-rel"
     category: "chromium.chromiumos|default"
     short_name: "lcr"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-lacros-tester-rel"
+    name: "buildbucket/luci.chromium-m92.ci/linux-lacros-tester-rel"
     category: "chromium.chromiumos|default"
     short_name: "lcr"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/chromeos-amd64-generic-lacros-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/chromeos-amd64-generic-lacros-dbg"
     category: "chromium.chromiumos|lacros|x64"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/chromeos-arm-generic-rel"
+    name: "buildbucket/luci.chromium-m92.ci/chromeos-arm-generic-rel"
     category: "chromium.chromiumos|simple|release"
     short_name: "arm"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/chromeos-kevin-rel"
+    name: "buildbucket/luci.chromium-m92.ci/chromeos-kevin-rel"
     category: "chromium.chromiumos|simple|release"
     short_name: "kvn"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/chromeos-amd64-generic-rel"
+    name: "buildbucket/luci.chromium-m92.ci/chromeos-amd64-generic-rel"
     category: "chromium.chromiumos|simple|release|x64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/chromeos-amd64-generic-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/chromeos-amd64-generic-dbg"
     category: "chromium.chromiumos|simple|debug|x64"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-cronet-arm-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/android-cronet-arm-dbg"
     category: "chromium.android|cronet|arm"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-cronet-arm-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-cronet-arm-rel"
     category: "chromium.android|cronet|arm"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-cronet-arm-rel-kitkat-tests"
+    name: "buildbucket/luci.chromium-m92.ci/android-cronet-arm-rel-kitkat-tests"
     category: "chromium.android|cronet|test"
     short_name: "k"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-cronet-arm-rel-lollipop-tests"
+    name: "buildbucket/luci.chromium-m92.ci/android-cronet-arm-rel-lollipop-tests"
     category: "chromium.android|cronet|test"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android arm Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android arm Builder (dbg)"
     category: "chromium.android|builder|arm"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android arm64 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android arm64 Builder (dbg)"
     category: "chromium.android|builder|arm"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android x86 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android x86 Builder (dbg)"
     category: "chromium.android|builder|x86"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android x64 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android x64 Builder (dbg)"
     category: "chromium.android|builder|x86"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Marshmallow 64 bit Tester"
+    name: "buildbucket/luci.chromium-m92.ci/Marshmallow 64 bit Tester"
     category: "chromium.android|tester|phone"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Nougat Phone Tester"
+    name: "buildbucket/luci.chromium-m92.ci/Nougat Phone Tester"
     category: "chromium.android|tester|phone"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Oreo Phone Tester"
+    name: "buildbucket/luci.chromium-m92.ci/Oreo Phone Tester"
     category: "chromium.android|tester|phone"
     short_name: "O"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-pie-arm64-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/android-pie-arm64-dbg"
     category: "chromium.android|tester|phone"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android WebView M (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android WebView M (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android WebView N (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android WebView N (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android WebView O (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android WebView O (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "O"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android WebView P (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android WebView P (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-nougat-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-nougat-arm64-rel"
     category: "chromium.android|builder_tester|arm64"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-marshmallow-x86-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-marshmallow-x86-rel"
     category: "chromium.android|builder_tester|x86"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-lollipop-arm-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-lollipop-arm-rel"
     category: "chromium.android|on_cq"
     short_name: "L"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-marshmallow-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-marshmallow-arm64-rel"
     category: "chromium.android|on_cq"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-pie-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-pie-arm64-rel"
     category: "chromium.android|on_cq"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Cast Android (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Cast Android (dbg)"
     category: "chromium.android|on_cq"
     short_name: "cst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux TSan Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Linux TSan Builder"
     category: "chromium.memory|linux|TSan v2"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux TSan Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Linux TSan (bionic)"
     category: "chromium.memory|linux|TSan v2"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux ASan LSan Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Linux TSan Tests"
+    category: "chromium.memory|linux|TSan v2"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m92.ci/Linux ASan LSan Builder"
     category: "chromium.memory|linux|asan lsan"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux ASan LSan Tests (1)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux ASan LSan Tests (1)"
     category: "chromium.memory|linux|asan lsan"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux ASan Tests (sandboxed)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux ASan Tests (sandboxed)"
     category: "chromium.memory|linux|asan lsan"
     short_name: "sbx"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Linux x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Linux x64 DEPS Builder"
     category: "chromium.dawn|DEPS|Linux|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
     category: "chromium.dawn|DEPS|Linux|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
     category: "chromium.dawn|DEPS|Linux|Nvidia"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Mac x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Mac x64 DEPS Builder"
     category: "chromium.dawn|DEPS|Mac|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Mac x64 DEPS Release (AMD)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Mac x64 DEPS Release (AMD)"
     category: "chromium.dawn|DEPS|Mac|AMD"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Mac x64 DEPS Release (Intel)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Mac x64 DEPS Release (Intel)"
     category: "chromium.dawn|DEPS|Mac|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x86 DEPS Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x86 DEPS Builder"
     category: "chromium.dawn|DEPS|Windows|Builder"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x64 DEPS Builder"
     category: "chromium.dawn|DEPS|Windows|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
     category: "chromium.dawn|DEPS|Windows|Intel"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
     category: "chromium.dawn|DEPS|Windows|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
     category: "chromium.dawn|DEPS|Windows|Nvidia"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
     category: "chromium.dawn|DEPS|Windows|Nvidia"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/GPU Win x64 Builder"
+    name: "buildbucket/luci.chromium-m92.ci/GPU Win x64 Builder"
     category: "chromium.gpu|Windows"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win10 x64 Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Win10 x64 Release (NVIDIA)"
     category: "chromium.gpu|Windows"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/GPU Mac Builder"
+    name: "buildbucket/luci.chromium-m92.ci/GPU Mac Builder"
     category: "chromium.gpu|Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac Release (Intel)"
+    name: "buildbucket/luci.chromium-m92.ci/Mac Release (Intel)"
     category: "chromium.gpu|Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac Retina Release (AMD)"
+    name: "buildbucket/luci.chromium-m92.ci/Mac Retina Release (AMD)"
     category: "chromium.gpu|Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/GPU Linux Builder"
+    name: "buildbucket/luci.chromium-m92.ci/GPU Linux Builder"
     category: "chromium.gpu|Linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Release (NVIDIA)"
     category: "chromium.gpu|Linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android Release (Nexus 5X)"
+    name: "buildbucket/luci.chromium-m92.ci/Android Release (Nexus 5X)"
     category: "chromium.gpu|Android"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/ios-simulator-cronet"
+    name: "buildbucket/luci.chromium-m92.ci/ios-simulator-cronet"
     category: "chromium.fyi|cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/VR Linux"
+    name: "buildbucket/luci.chromium-m92.ci/VR Linux"
     category: "chromium.fyi|linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/VR Linux (reclient)"
+    name: "buildbucket/luci.chromium-m92.ci/VR Linux (reclient)"
     category: "chromium.fyi|linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Ozone Tester (Headless)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Ozone Tester (Headless)"
     category: "chromium.fyi|linux"
     short_name: "loh"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Ozone Tester (Wayland)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Ozone Tester (Wayland)"
     category: "chromium.fyi|linux"
     short_name: "low"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Ozone Tester (X11)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Ozone Tester (X11)"
     category: "chromium.fyi|linux"
     short_name: "lox"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-official"
+    name: "buildbucket/luci.chromium-m92.ci/linux-official"
     category: "chromium.fyi|linux"
     short_name: "off"
   }
@@ -490,454 +500,464 @@ consoles {
       show_primary_secondary_labels: true
     }
     console_groups {
-      console_ids: "chromium-m91/chromium"
-      console_ids: "chromium-m91/chromium.win"
-      console_ids: "chromium-m91/chromium.mac"
-      console_ids: "chromium-m91/chromium.linux"
-      console_ids: "chromium-m91/chromium.chromiumos"
-      console_ids: "chromium-m91/chromium.memory"
-      console_ids: "chromium-m91/chromium.gpu"
-      console_ids: "chromium-m91/chromium.android"
+      console_ids: "chromium-m92/chromium"
+      console_ids: "chromium-m92/chromium.win"
+      console_ids: "chromium-m92/chromium.mac"
+      console_ids: "chromium-m92/chromium.linux"
+      console_ids: "chromium-m92/chromium.chromiumos"
+      console_ids: "chromium-m92/chromium.memory"
+      console_ids: "chromium-m92/chromium.gpu"
+      console_ids: "chromium-m92/chromium.android"
     }
   }
 }
 consoles {
   id: "mirrors"
-  name: "Chromium M91 CQ Mirrors Console"
+  name: "Chromium M92 CQ Mirrors Console"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4472"
+  refs: "regexp:refs/branch-heads/4515"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win x64 Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Win x64 Builder"
     category: "chromium.win|release|builder"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win 7 Tests x64 (1)"
+    name: "buildbucket/luci.chromium-m92.ci/Win 7 Tests x64 (1)"
     category: "chromium.win|release|tester"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win10 Tests x64"
+    name: "buildbucket/luci.chromium-m92.ci/Win10 Tests x64"
     category: "chromium.win|release|tester"
     short_name: "w10"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Win Builder (dbg)"
     category: "chromium.win|debug|builder"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win7 Tests (dbg)(1)"
+    name: "buildbucket/luci.chromium-m92.ci/Win7 Tests (dbg)(1)"
     category: "chromium.win|debug|tester"
     short_name: "7"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Mac Builder"
     category: "chromium.mac|release"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.11 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.11 Tests"
     category: "chromium.mac|release"
     short_name: "11"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.12 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.12 Tests"
     category: "chromium.mac|release"
     short_name: "12"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.13 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.13 Tests"
     category: "chromium.mac|release"
     short_name: "13"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.14 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.14 Tests"
     category: "chromium.mac|release"
     short_name: "14"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.15 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.15 Tests"
     category: "chromium.mac|release"
     short_name: "15"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Mac Builder (dbg)"
     category: "chromium.mac|debug"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.15 Tests (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.15 Tests (dbg)"
     category: "chromium.mac|debug"
     short_name: "15"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/ios-simulator"
+    name: "buildbucket/luci.chromium-m92.ci/ios-simulator"
     category: "chromium.mac|ios|default"
     short_name: "sim"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/ios-simulator-full-configs"
+    name: "buildbucket/luci.chromium-m92.ci/ios-simulator-full-configs"
     category: "chromium.mac|ios|default"
     short_name: "ful"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Builder"
     category: "chromium.linux|release"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tests"
     category: "chromium.linux|release"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-ozone-rel"
+    name: "buildbucket/luci.chromium-m92.ci/linux-ozone-rel"
     category: "chromium.linux|release"
     short_name: "ozo"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tester (Ozone Headless)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tester (Ozone Headless)"
     category: "chromium.linux|release|ozone"
     short_name: "ltoh"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tester (Ozone Wayland)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tester (Ozone Wayland)"
     category: "chromium.linux|release|ozone"
     short_name: "ltow"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tester (Ozone X11)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tester (Ozone X11)"
     category: "chromium.linux|release|ozone"
     short_name: "ltox"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Builder (dbg)"
     category: "chromium.linux|debug|builder"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tests (dbg)(1)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tests (dbg)(1)"
     category: "chromium.linux|debug|tester"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Cast Linux"
+    name: "buildbucket/luci.chromium-m92.ci/Cast Linux"
     category: "chromium.linux|cast"
     short_name: "vid"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Fuchsia ARM64"
+    name: "buildbucket/luci.chromium-m92.ci/Cast Linux Debug"
+    category: "chromium.linux|cast"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m92.ci/Fuchsia ARM64"
     category: "chromium.linux|fuchsia|a64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/fuchsia-arm64-cast"
+    name: "buildbucket/luci.chromium-m92.ci/fuchsia-arm64-cast"
     category: "chromium.linux|fuchsia|cast"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/fuchsia-x64-cast"
+    name: "buildbucket/luci.chromium-m92.ci/fuchsia-x64-cast"
     category: "chromium.linux|fuchsia|cast"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Fuchsia x64"
+    name: "buildbucket/luci.chromium-m92.ci/Fuchsia x64"
     category: "chromium.linux|fuchsia|x64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-chromeos-rel"
+    name: "buildbucket/luci.chromium-m92.ci/linux-chromeos-rel"
     category: "chromium.chromiumos|default"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-chromeos-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/linux-chromeos-dbg"
     category: "chromium.chromiumos|default"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-lacros-builder-rel"
+    name: "buildbucket/luci.chromium-m92.ci/linux-lacros-builder-rel"
     category: "chromium.chromiumos|default"
     short_name: "lcr"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-lacros-tester-rel"
+    name: "buildbucket/luci.chromium-m92.ci/linux-lacros-tester-rel"
     category: "chromium.chromiumos|default"
     short_name: "lcr"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/chromeos-amd64-generic-lacros-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/chromeos-amd64-generic-lacros-dbg"
     category: "chromium.chromiumos|lacros|x64"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/chromeos-arm-generic-rel"
+    name: "buildbucket/luci.chromium-m92.ci/chromeos-arm-generic-rel"
     category: "chromium.chromiumos|simple|release"
     short_name: "arm"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/chromeos-amd64-generic-rel"
+    name: "buildbucket/luci.chromium-m92.ci/chromeos-amd64-generic-rel"
     category: "chromium.chromiumos|simple|release|x64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/chromeos-amd64-generic-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/chromeos-amd64-generic-dbg"
     category: "chromium.chromiumos|simple|debug|x64"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-cronet-arm-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/android-cronet-arm-dbg"
     category: "chromium.android|cronet|arm"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-cronet-arm-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-cronet-arm-rel"
     category: "chromium.android|cronet|arm"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-cronet-arm-rel-kitkat-tests"
+    name: "buildbucket/luci.chromium-m92.ci/android-cronet-arm-rel-kitkat-tests"
     category: "chromium.android|cronet|test"
     short_name: "k"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-cronet-arm-rel-lollipop-tests"
+    name: "buildbucket/luci.chromium-m92.ci/android-cronet-arm-rel-lollipop-tests"
     category: "chromium.android|cronet|test"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android arm Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android arm Builder (dbg)"
     category: "chromium.android|builder|arm"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android arm64 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android arm64 Builder (dbg)"
     category: "chromium.android|builder|arm"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android x86 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android x86 Builder (dbg)"
     category: "chromium.android|builder|x86"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android x64 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android x64 Builder (dbg)"
     category: "chromium.android|builder|x86"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Marshmallow 64 bit Tester"
+    name: "buildbucket/luci.chromium-m92.ci/Marshmallow 64 bit Tester"
     category: "chromium.android|tester|phone"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Nougat Phone Tester"
+    name: "buildbucket/luci.chromium-m92.ci/Nougat Phone Tester"
     category: "chromium.android|tester|phone"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Oreo Phone Tester"
+    name: "buildbucket/luci.chromium-m92.ci/Oreo Phone Tester"
     category: "chromium.android|tester|phone"
     short_name: "O"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-pie-arm64-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/android-pie-arm64-dbg"
     category: "chromium.android|tester|phone"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android WebView M (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android WebView M (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android WebView N (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android WebView N (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android WebView O (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android WebView O (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "O"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android WebView P (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android WebView P (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-nougat-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-nougat-arm64-rel"
     category: "chromium.android|builder_tester|arm64"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-marshmallow-x86-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-marshmallow-x86-rel"
     category: "chromium.android|builder_tester|x86"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-lollipop-arm-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-lollipop-arm-rel"
     category: "chromium.android|on_cq"
     short_name: "L"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-marshmallow-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-marshmallow-arm64-rel"
     category: "chromium.android|on_cq"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-pie-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-pie-arm64-rel"
     category: "chromium.android|on_cq"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Cast Android (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Cast Android (dbg)"
     category: "chromium.android|on_cq"
     short_name: "cst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux TSan Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Linux TSan Builder"
     category: "chromium.memory|linux|TSan v2"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux TSan Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Linux TSan (bionic)"
     category: "chromium.memory|linux|TSan v2"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux ASan LSan Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Linux TSan Tests"
+    category: "chromium.memory|linux|TSan v2"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m92.ci/Linux ASan LSan Builder"
     category: "chromium.memory|linux|asan lsan"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux ASan LSan Tests (1)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux ASan LSan Tests (1)"
     category: "chromium.memory|linux|asan lsan"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux ASan Tests (sandboxed)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux ASan Tests (sandboxed)"
     category: "chromium.memory|linux|asan lsan"
     short_name: "sbx"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Linux x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Linux x64 DEPS Builder"
     category: "chromium.dawn|DEPS|Linux|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
     category: "chromium.dawn|DEPS|Linux|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
     category: "chromium.dawn|DEPS|Linux|Nvidia"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Mac x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Mac x64 DEPS Builder"
     category: "chromium.dawn|DEPS|Mac|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Mac x64 DEPS Release (AMD)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Mac x64 DEPS Release (AMD)"
     category: "chromium.dawn|DEPS|Mac|AMD"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Mac x64 DEPS Release (Intel)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Mac x64 DEPS Release (Intel)"
     category: "chromium.dawn|DEPS|Mac|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x86 DEPS Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x86 DEPS Builder"
     category: "chromium.dawn|DEPS|Windows|Builder"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x64 DEPS Builder"
     category: "chromium.dawn|DEPS|Windows|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
     category: "chromium.dawn|DEPS|Windows|Intel"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
     category: "chromium.dawn|DEPS|Windows|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
     category: "chromium.dawn|DEPS|Windows|Nvidia"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
     category: "chromium.dawn|DEPS|Windows|Nvidia"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/GPU Win x64 Builder"
+    name: "buildbucket/luci.chromium-m92.ci/GPU Win x64 Builder"
     category: "chromium.gpu|Windows"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win10 x64 Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Win10 x64 Release (NVIDIA)"
     category: "chromium.gpu|Windows"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/GPU Mac Builder"
+    name: "buildbucket/luci.chromium-m92.ci/GPU Mac Builder"
     category: "chromium.gpu|Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac Release (Intel)"
+    name: "buildbucket/luci.chromium-m92.ci/Mac Release (Intel)"
     category: "chromium.gpu|Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac Retina Release (AMD)"
+    name: "buildbucket/luci.chromium-m92.ci/Mac Retina Release (AMD)"
     category: "chromium.gpu|Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/GPU Linux Builder"
+    name: "buildbucket/luci.chromium-m92.ci/GPU Linux Builder"
     category: "chromium.gpu|Linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Release (NVIDIA)"
     category: "chromium.gpu|Linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android Release (Nexus 5X)"
+    name: "buildbucket/luci.chromium-m92.ci/Android Release (Nexus 5X)"
     category: "chromium.gpu|Android"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/ios-simulator-cronet"
+    name: "buildbucket/luci.chromium-m92.ci/ios-simulator-cronet"
     category: "chromium.fyi|cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/VR Linux"
+    name: "buildbucket/luci.chromium-m92.ci/VR Linux"
     category: "chromium.fyi|linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/VR Linux (reclient)"
+    name: "buildbucket/luci.chromium-m92.ci/VR Linux (reclient)"
     category: "chromium.fyi|linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Ozone Tester (Headless)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Ozone Tester (Headless)"
     category: "chromium.fyi|linux"
     short_name: "loh"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Ozone Tester (Wayland)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Ozone Tester (Wayland)"
     category: "chromium.fyi|linux"
     short_name: "low"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Ozone Tester (X11)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Ozone Tester (X11)"
     category: "chromium.fyi|linux"
     short_name: "lox"
   }
@@ -952,181 +972,187 @@ consoles {
       show_primary_secondary_labels: true
     }
     console_groups {
-      console_ids: "chromium-m91/chromium"
-      console_ids: "chromium-m91/chromium.win"
-      console_ids: "chromium-m91/chromium.mac"
-      console_ids: "chromium-m91/chromium.linux"
-      console_ids: "chromium-m91/chromium.chromiumos"
-      console_ids: "chromium-m91/chromium.memory"
-      console_ids: "chromium-m91/chromium.gpu"
-      console_ids: "chromium-m91/chromium.android"
+      console_ids: "chromium-m92/chromium"
+      console_ids: "chromium-m92/chromium.win"
+      console_ids: "chromium-m92/chromium.mac"
+      console_ids: "chromium-m92/chromium.linux"
+      console_ids: "chromium-m92/chromium.chromiumos"
+      console_ids: "chromium-m92/chromium.memory"
+      console_ids: "chromium-m92/chromium.gpu"
+      console_ids: "chromium-m92/chromium.android"
     }
   }
 }
 consoles {
   id: "try"
-  name: "Chromium M91 CQ Console"
+  name: "Chromium M92 CQ Console"
+  builders {
+    name: "buildbucket/luci.chromium-m92.try/android-binary-size"
+  }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-binary-size"
+    name: "buildbucket/luci.chromium-m92.try/android-cronet-arm-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-cronet-arm-dbg"
+    name: "buildbucket/luci.chromium-m92.try/android-lollipop-arm-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-lollipop-arm-rel"
+    name: "buildbucket/luci.chromium-m92.try/android-marshmallow-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-marshmallow-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.try/android-pie-arm64-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-pie-arm64-dbg"
+    name: "buildbucket/luci.chromium-m92.try/android-pie-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-pie-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.try/android_compile_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_compile_dbg"
+    name: "buildbucket/luci.chromium-m92.try/android_compile_x64_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_compile_x64_dbg"
+    name: "buildbucket/luci.chromium-m92.try/android_compile_x86_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_compile_x86_dbg"
+    name: "buildbucket/luci.chromium-m92.try/android_cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_cronet"
+    name: "buildbucket/luci.chromium-m92.try/android_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m92.try/cast_shell_android"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/cast_shell_android"
+    name: "buildbucket/luci.chromium-m92.try/cast_shell_linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/cast_shell_linux"
+    name: "buildbucket/luci.chromium-m92.try/cast_shell_linux_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromeos-amd64-generic-dbg"
+    name: "buildbucket/luci.chromium-m92.try/chromeos-amd64-generic-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromeos-amd64-generic-rel"
+    name: "buildbucket/luci.chromium-m92.try/chromeos-amd64-generic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromeos-arm-generic-rel"
+    name: "buildbucket/luci.chromium-m92.try/chromeos-arm-generic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromeos-kevin-rel"
+    name: "buildbucket/luci.chromium-m92.try/chromeos-kevin-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromium_presubmit"
+    name: "buildbucket/luci.chromium-m92.try/chromium_presubmit"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/dawn-linux-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m92.try/dawn-linux-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/dawn-mac-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m92.try/dawn-mac-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/dawn-win10-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m92.try/dawn-win10-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/dawn-win10-x86-deps-rel"
+    name: "buildbucket/luci.chromium-m92.try/dawn-win10-x86-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/fuchsia-arm64-cast"
+    name: "buildbucket/luci.chromium-m92.try/fuchsia-arm64-cast"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/fuchsia-x64-cast"
+    name: "buildbucket/luci.chromium-m92.try/fuchsia-x64-cast"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/fuchsia_arm64"
+    name: "buildbucket/luci.chromium-m92.try/fuchsia_arm64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/fuchsia_x64"
+    name: "buildbucket/luci.chromium-m92.try/fuchsia_x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/ios-simulator"
+    name: "buildbucket/luci.chromium-m92.try/ios-simulator"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/ios-simulator-cronet"
+    name: "buildbucket/luci.chromium-m92.try/ios-simulator-cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/ios-simulator-full-configs"
+    name: "buildbucket/luci.chromium-m92.try/ios-simulator-full-configs"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-blink-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-blink-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-chromeos-compile-dbg"
+    name: "buildbucket/luci.chromium-m92.try/linux-chromeos-compile-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-chromeos-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-chromeos-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-libfuzzer-asan-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-libfuzzer-asan-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-ozone-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-ozone-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-rel-compilator"
+    name: "buildbucket/luci.chromium-m92.try/linux-rel-compilator"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-rel-orchestrator"
+    name: "buildbucket/luci.chromium-m92.try/linux-rel-orchestrator"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-rel-reclient"
+    name: "buildbucket/luci.chromium-m92.try/linux-rel-reclient"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_chromium_asan_rel_ng"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_asan_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_chromium_dbg_ng"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_chromium_tsan_rel_ng"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_tsan_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_layout_tests_composite_after_paint"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_tsan_rel_ng_bionic"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_layout_tests_layout_ng_disabled"
+    name: "buildbucket/luci.chromium-m92.try/linux_layout_tests_composite_after_paint"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m92.try/linux_layout_tests_layout_ng_disabled"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_vr"
+    name: "buildbucket/luci.chromium-m92.try/linux_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/mac-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux_vr"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/mac_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m92.try/mac-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/mac_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m92.try/mac_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win-libfuzzer-asan-rel"
+    name: "buildbucket/luci.chromium-m92.try/mac_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win10_chromium_x64_rel_ng"
+    name: "buildbucket/luci.chromium-m92.try/win-libfuzzer-asan-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win7-rel"
+    name: "buildbucket/luci.chromium-m92.try/win10_chromium_x64_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m92.try/win7-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m92.try/win_chromium_compile_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m92.try/win_optional_gpu_tests_rel"
   }
   builder_view_only: true
 }
@@ -1134,25 +1160,25 @@ consoles {
   id: "chromium"
   name: "chromium"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4472"
+  refs: "regexp:refs/branch-heads/4515"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-official"
+    name: "buildbucket/luci.chromium-m92.ci/android-official"
     category: "android"
     short_name: "off"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/fuchsia-official"
+    name: "buildbucket/luci.chromium-m92.ci/fuchsia-official"
     category: "fuchsia"
     short_name: "off"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/win32-official"
+    name: "buildbucket/luci.chromium-m92.ci/win32-official"
     category: "win|off"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/win-official"
+    name: "buildbucket/luci.chromium-m92.ci/win-official"
     category: "win|off"
     short_name: "64"
   }
@@ -1167,14 +1193,14 @@ consoles {
       show_primary_secondary_labels: true
     }
     console_groups {
-      console_ids: "chromium-m91/chromium"
-      console_ids: "chromium-m91/chromium.win"
-      console_ids: "chromium-m91/chromium.mac"
-      console_ids: "chromium-m91/chromium.linux"
-      console_ids: "chromium-m91/chromium.chromiumos"
-      console_ids: "chromium-m91/chromium.memory"
-      console_ids: "chromium-m91/chromium.gpu"
-      console_ids: "chromium-m91/chromium.android"
+      console_ids: "chromium-m92/chromium"
+      console_ids: "chromium-m92/chromium.win"
+      console_ids: "chromium-m92/chromium.mac"
+      console_ids: "chromium-m92/chromium.linux"
+      console_ids: "chromium-m92/chromium.chromiumos"
+      console_ids: "chromium-m92/chromium.memory"
+      console_ids: "chromium-m92/chromium.gpu"
+      console_ids: "chromium-m92/chromium.android"
     }
   }
   include_experimental_builds: true
@@ -1183,115 +1209,115 @@ consoles {
   id: "chromium.android"
   name: "chromium.android"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4472"
+  refs: "regexp:refs/branch-heads/4515"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-cronet-arm-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/android-cronet-arm-dbg"
     category: "cronet|arm"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-cronet-arm-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-cronet-arm-rel"
     category: "cronet|arm"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-cronet-arm-rel-kitkat-tests"
+    name: "buildbucket/luci.chromium-m92.ci/android-cronet-arm-rel-kitkat-tests"
     category: "cronet|test"
     short_name: "k"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-cronet-arm-rel-lollipop-tests"
+    name: "buildbucket/luci.chromium-m92.ci/android-cronet-arm-rel-lollipop-tests"
     category: "cronet|test"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android arm Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android arm Builder (dbg)"
     category: "builder|arm"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android arm64 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android arm64 Builder (dbg)"
     category: "builder|arm"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android x86 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android x86 Builder (dbg)"
     category: "builder|x86"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android x64 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android x64 Builder (dbg)"
     category: "builder|x86"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Marshmallow 64 bit Tester"
+    name: "buildbucket/luci.chromium-m92.ci/Marshmallow 64 bit Tester"
     category: "tester|phone"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Nougat Phone Tester"
+    name: "buildbucket/luci.chromium-m92.ci/Nougat Phone Tester"
     category: "tester|phone"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Oreo Phone Tester"
+    name: "buildbucket/luci.chromium-m92.ci/Oreo Phone Tester"
     category: "tester|phone"
     short_name: "O"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-pie-arm64-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/android-pie-arm64-dbg"
     category: "tester|phone"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android WebView M (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android WebView M (dbg)"
     category: "tester|webview"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android WebView N (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android WebView N (dbg)"
     category: "tester|webview"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android WebView O (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android WebView O (dbg)"
     category: "tester|webview"
     short_name: "O"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android WebView P (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Android WebView P (dbg)"
     category: "tester|webview"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-nougat-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-nougat-arm64-rel"
     category: "builder_tester|arm64"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-marshmallow-x86-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-marshmallow-x86-rel"
     category: "builder_tester|x86"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-lollipop-arm-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-lollipop-arm-rel"
     category: "on_cq"
     short_name: "L"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-marshmallow-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-marshmallow-arm64-rel"
     category: "on_cq"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-pie-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.ci/android-pie-arm64-rel"
     category: "on_cq"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Cast Android (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Cast Android (dbg)"
     category: "on_cq"
     short_name: "cst"
   }
@@ -1306,14 +1332,14 @@ consoles {
       show_primary_secondary_labels: true
     }
     console_groups {
-      console_ids: "chromium-m91/chromium"
-      console_ids: "chromium-m91/chromium.win"
-      console_ids: "chromium-m91/chromium.mac"
-      console_ids: "chromium-m91/chromium.linux"
-      console_ids: "chromium-m91/chromium.chromiumos"
-      console_ids: "chromium-m91/chromium.memory"
-      console_ids: "chromium-m91/chromium.gpu"
-      console_ids: "chromium-m91/chromium.android"
+      console_ids: "chromium-m92/chromium"
+      console_ids: "chromium-m92/chromium.win"
+      console_ids: "chromium-m92/chromium.mac"
+      console_ids: "chromium-m92/chromium.linux"
+      console_ids: "chromium-m92/chromium.chromiumos"
+      console_ids: "chromium-m92/chromium.memory"
+      console_ids: "chromium-m92/chromium.gpu"
+      console_ids: "chromium-m92/chromium.android"
     }
   }
 }
@@ -1321,50 +1347,50 @@ consoles {
   id: "chromium.chromiumos"
   name: "chromium.chromiumos"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4472"
+  refs: "regexp:refs/branch-heads/4515"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-chromeos-rel"
+    name: "buildbucket/luci.chromium-m92.ci/linux-chromeos-rel"
     category: "default"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-chromeos-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/linux-chromeos-dbg"
     category: "default"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-lacros-builder-rel"
+    name: "buildbucket/luci.chromium-m92.ci/linux-lacros-builder-rel"
     category: "default"
     short_name: "lcr"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-lacros-tester-rel"
+    name: "buildbucket/luci.chromium-m92.ci/linux-lacros-tester-rel"
     category: "default"
     short_name: "lcr"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/chromeos-amd64-generic-lacros-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/chromeos-amd64-generic-lacros-dbg"
     category: "lacros|x64"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/chromeos-arm-generic-rel"
+    name: "buildbucket/luci.chromium-m92.ci/chromeos-arm-generic-rel"
     category: "simple|release"
     short_name: "arm"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/chromeos-kevin-rel"
+    name: "buildbucket/luci.chromium-m92.ci/chromeos-kevin-rel"
     category: "simple|release"
     short_name: "kvn"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/chromeos-amd64-generic-rel"
+    name: "buildbucket/luci.chromium-m92.ci/chromeos-amd64-generic-rel"
     category: "simple|release|x64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/chromeos-amd64-generic-dbg"
+    name: "buildbucket/luci.chromium-m92.ci/chromeos-amd64-generic-dbg"
     category: "simple|debug|x64"
     short_name: "dbg"
   }
@@ -1379,14 +1405,14 @@ consoles {
       show_primary_secondary_labels: true
     }
     console_groups {
-      console_ids: "chromium-m91/chromium"
-      console_ids: "chromium-m91/chromium.win"
-      console_ids: "chromium-m91/chromium.mac"
-      console_ids: "chromium-m91/chromium.linux"
-      console_ids: "chromium-m91/chromium.chromiumos"
-      console_ids: "chromium-m91/chromium.memory"
-      console_ids: "chromium-m91/chromium.gpu"
-      console_ids: "chromium-m91/chromium.android"
+      console_ids: "chromium-m92/chromium"
+      console_ids: "chromium-m92/chromium.win"
+      console_ids: "chromium-m92/chromium.mac"
+      console_ids: "chromium-m92/chromium.linux"
+      console_ids: "chromium-m92/chromium.chromiumos"
+      console_ids: "chromium-m92/chromium.memory"
+      console_ids: "chromium-m92/chromium.gpu"
+      console_ids: "chromium-m92/chromium.android"
     }
   }
 }
@@ -1394,65 +1420,65 @@ consoles {
   id: "chromium.dawn"
   name: "chromium.dawn"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4472"
+  refs: "regexp:refs/branch-heads/4515"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Linux x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Linux x64 DEPS Builder"
     category: "DEPS|Linux|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
     category: "DEPS|Linux|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
     category: "DEPS|Linux|Nvidia"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Mac x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Mac x64 DEPS Builder"
     category: "DEPS|Mac|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Mac x64 DEPS Release (AMD)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Mac x64 DEPS Release (AMD)"
     category: "DEPS|Mac|AMD"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Mac x64 DEPS Release (Intel)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Mac x64 DEPS Release (Intel)"
     category: "DEPS|Mac|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x86 DEPS Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x86 DEPS Builder"
     category: "DEPS|Windows|Builder"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x64 DEPS Builder"
     category: "DEPS|Windows|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
     category: "DEPS|Windows|Intel"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
     category: "DEPS|Windows|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
     category: "DEPS|Windows|Nvidia"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
     category: "DEPS|Windows|Nvidia"
     short_name: "x64"
   }
@@ -1467,14 +1493,14 @@ consoles {
       show_primary_secondary_labels: true
     }
     console_groups {
-      console_ids: "chromium-m91/chromium"
-      console_ids: "chromium-m91/chromium.win"
-      console_ids: "chromium-m91/chromium.mac"
-      console_ids: "chromium-m91/chromium.linux"
-      console_ids: "chromium-m91/chromium.chromiumos"
-      console_ids: "chromium-m91/chromium.memory"
-      console_ids: "chromium-m91/chromium.gpu"
-      console_ids: "chromium-m91/chromium.android"
+      console_ids: "chromium-m92/chromium"
+      console_ids: "chromium-m92/chromium.win"
+      console_ids: "chromium-m92/chromium.mac"
+      console_ids: "chromium-m92/chromium.linux"
+      console_ids: "chromium-m92/chromium.chromiumos"
+      console_ids: "chromium-m92/chromium.memory"
+      console_ids: "chromium-m92/chromium.gpu"
+      console_ids: "chromium-m92/chromium.android"
     }
   }
 }
@@ -1482,37 +1508,37 @@ consoles {
   id: "chromium.fyi"
   name: "chromium.fyi"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4472"
+  refs: "regexp:refs/branch-heads/4515"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/ios-simulator-cronet"
+    name: "buildbucket/luci.chromium-m92.ci/ios-simulator-cronet"
     category: "cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/VR Linux"
+    name: "buildbucket/luci.chromium-m92.ci/VR Linux"
     category: "linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/VR Linux (reclient)"
+    name: "buildbucket/luci.chromium-m92.ci/VR Linux (reclient)"
     category: "linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Ozone Tester (Headless)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Ozone Tester (Headless)"
     category: "linux"
     short_name: "loh"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Ozone Tester (Wayland)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Ozone Tester (Wayland)"
     category: "linux"
     short_name: "low"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Ozone Tester (X11)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Ozone Tester (X11)"
     category: "linux"
     short_name: "lox"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-official"
+    name: "buildbucket/luci.chromium-m92.ci/linux-official"
     category: "linux"
     short_name: "off"
   }
@@ -1527,14 +1553,14 @@ consoles {
       show_primary_secondary_labels: true
     }
     console_groups {
-      console_ids: "chromium-m91/chromium"
-      console_ids: "chromium-m91/chromium.win"
-      console_ids: "chromium-m91/chromium.mac"
-      console_ids: "chromium-m91/chromium.linux"
-      console_ids: "chromium-m91/chromium.chromiumos"
-      console_ids: "chromium-m91/chromium.memory"
-      console_ids: "chromium-m91/chromium.gpu"
-      console_ids: "chromium-m91/chromium.android"
+      console_ids: "chromium-m92/chromium"
+      console_ids: "chromium-m92/chromium.win"
+      console_ids: "chromium-m92/chromium.mac"
+      console_ids: "chromium-m92/chromium.linux"
+      console_ids: "chromium-m92/chromium.chromiumos"
+      console_ids: "chromium-m92/chromium.memory"
+      console_ids: "chromium-m92/chromium.gpu"
+      console_ids: "chromium-m92/chromium.android"
     }
   }
 }
@@ -1542,38 +1568,38 @@ consoles {
   id: "chromium.gpu"
   name: "chromium.gpu"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4472"
+  refs: "regexp:refs/branch-heads/4515"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/GPU Win x64 Builder"
+    name: "buildbucket/luci.chromium-m92.ci/GPU Win x64 Builder"
     category: "Windows"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win10 x64 Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Win10 x64 Release (NVIDIA)"
     category: "Windows"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/GPU Mac Builder"
+    name: "buildbucket/luci.chromium-m92.ci/GPU Mac Builder"
     category: "Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac Release (Intel)"
+    name: "buildbucket/luci.chromium-m92.ci/Mac Release (Intel)"
     category: "Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac Retina Release (AMD)"
+    name: "buildbucket/luci.chromium-m92.ci/Mac Retina Release (AMD)"
     category: "Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/GPU Linux Builder"
+    name: "buildbucket/luci.chromium-m92.ci/GPU Linux Builder"
     category: "Linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Release (NVIDIA)"
     category: "Linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Android Release (Nexus 5X)"
+    name: "buildbucket/luci.chromium-m92.ci/Android Release (Nexus 5X)"
     category: "Android"
   }
   header {
@@ -1587,14 +1613,14 @@ consoles {
       show_primary_secondary_labels: true
     }
     console_groups {
-      console_ids: "chromium-m91/chromium"
-      console_ids: "chromium-m91/chromium.win"
-      console_ids: "chromium-m91/chromium.mac"
-      console_ids: "chromium-m91/chromium.linux"
-      console_ids: "chromium-m91/chromium.chromiumos"
-      console_ids: "chromium-m91/chromium.memory"
-      console_ids: "chromium-m91/chromium.gpu"
-      console_ids: "chromium-m91/chromium.android"
+      console_ids: "chromium-m92/chromium"
+      console_ids: "chromium-m92/chromium.win"
+      console_ids: "chromium-m92/chromium.mac"
+      console_ids: "chromium-m92/chromium.linux"
+      console_ids: "chromium-m92/chromium.chromiumos"
+      console_ids: "chromium-m92/chromium.memory"
+      console_ids: "chromium-m92/chromium.gpu"
+      console_ids: "chromium-m92/chromium.android"
     }
   }
 }
@@ -1602,70 +1628,75 @@ consoles {
   id: "chromium.linux"
   name: "chromium.linux"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4472"
+  refs: "regexp:refs/branch-heads/4515"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Builder"
     category: "release"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tests"
     category: "release"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/linux-ozone-rel"
+    name: "buildbucket/luci.chromium-m92.ci/linux-ozone-rel"
     category: "release"
     short_name: "ozo"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tester (Ozone Headless)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tester (Ozone Headless)"
     category: "release|ozone"
     short_name: "ltoh"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tester (Ozone Wayland)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tester (Ozone Wayland)"
     category: "release|ozone"
     short_name: "ltow"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tester (Ozone X11)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tester (Ozone X11)"
     category: "release|ozone"
     short_name: "ltox"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Builder (dbg)"
     category: "debug|builder"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux Tests (dbg)(1)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux Tests (dbg)(1)"
     category: "debug|tester"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Cast Linux"
+    name: "buildbucket/luci.chromium-m92.ci/Cast Linux"
     category: "cast"
     short_name: "vid"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Fuchsia ARM64"
+    name: "buildbucket/luci.chromium-m92.ci/Cast Linux Debug"
+    category: "cast"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m92.ci/Fuchsia ARM64"
     category: "fuchsia|a64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/fuchsia-arm64-cast"
+    name: "buildbucket/luci.chromium-m92.ci/fuchsia-arm64-cast"
     category: "fuchsia|cast"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/fuchsia-x64-cast"
+    name: "buildbucket/luci.chromium-m92.ci/fuchsia-x64-cast"
     category: "fuchsia|cast"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Fuchsia x64"
+    name: "buildbucket/luci.chromium-m92.ci/Fuchsia x64"
     category: "fuchsia|x64"
     short_name: "rel"
   }
@@ -1680,14 +1711,14 @@ consoles {
       show_primary_secondary_labels: true
     }
     console_groups {
-      console_ids: "chromium-m91/chromium"
-      console_ids: "chromium-m91/chromium.win"
-      console_ids: "chromium-m91/chromium.mac"
-      console_ids: "chromium-m91/chromium.linux"
-      console_ids: "chromium-m91/chromium.chromiumos"
-      console_ids: "chromium-m91/chromium.memory"
-      console_ids: "chromium-m91/chromium.gpu"
-      console_ids: "chromium-m91/chromium.android"
+      console_ids: "chromium-m92/chromium"
+      console_ids: "chromium-m92/chromium.win"
+      console_ids: "chromium-m92/chromium.mac"
+      console_ids: "chromium-m92/chromium.linux"
+      console_ids: "chromium-m92/chromium.chromiumos"
+      console_ids: "chromium-m92/chromium.memory"
+      console_ids: "chromium-m92/chromium.gpu"
+      console_ids: "chromium-m92/chromium.android"
     }
   }
 }
@@ -1695,60 +1726,60 @@ consoles {
   id: "chromium.mac"
   name: "chromium.mac"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4472"
+  refs: "regexp:refs/branch-heads/4515"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Mac Builder"
     category: "release"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.11 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.11 Tests"
     category: "release"
     short_name: "11"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.12 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.12 Tests"
     category: "release"
     short_name: "12"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.13 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.13 Tests"
     category: "release"
     short_name: "13"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.14 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.14 Tests"
     category: "release"
     short_name: "14"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.15 Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.15 Tests"
     category: "release"
     short_name: "15"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/mac-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.ci/mac-arm64-rel"
     category: "release|arm64"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Mac Builder (dbg)"
     category: "debug"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Mac10.15 Tests (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Mac10.15 Tests (dbg)"
     category: "debug"
     short_name: "15"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/ios-simulator"
+    name: "buildbucket/luci.chromium-m92.ci/ios-simulator"
     category: "ios|default"
     short_name: "sim"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/ios-simulator-full-configs"
+    name: "buildbucket/luci.chromium-m92.ci/ios-simulator-full-configs"
     category: "ios|default"
     short_name: "ful"
   }
@@ -1763,14 +1794,14 @@ consoles {
       show_primary_secondary_labels: true
     }
     console_groups {
-      console_ids: "chromium-m91/chromium"
-      console_ids: "chromium-m91/chromium.win"
-      console_ids: "chromium-m91/chromium.mac"
-      console_ids: "chromium-m91/chromium.linux"
-      console_ids: "chromium-m91/chromium.chromiumos"
-      console_ids: "chromium-m91/chromium.memory"
-      console_ids: "chromium-m91/chromium.gpu"
-      console_ids: "chromium-m91/chromium.android"
+      console_ids: "chromium-m92/chromium"
+      console_ids: "chromium-m92/chromium.win"
+      console_ids: "chromium-m92/chromium.mac"
+      console_ids: "chromium-m92/chromium.linux"
+      console_ids: "chromium-m92/chromium.chromiumos"
+      console_ids: "chromium-m92/chromium.memory"
+      console_ids: "chromium-m92/chromium.gpu"
+      console_ids: "chromium-m92/chromium.android"
     }
   }
 }
@@ -1778,30 +1809,35 @@ consoles {
   id: "chromium.memory"
   name: "chromium.memory"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4472"
+  refs: "regexp:refs/branch-heads/4515"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux TSan Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Linux TSan Builder"
     category: "linux|TSan v2"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux TSan Tests"
+    name: "buildbucket/luci.chromium-m92.ci/Linux TSan (bionic)"
+    category: "linux|TSan v2"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m92.ci/Linux TSan Tests"
     category: "linux|TSan v2"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux ASan LSan Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Linux ASan LSan Builder"
     category: "linux|asan lsan"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux ASan LSan Tests (1)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux ASan LSan Tests (1)"
     category: "linux|asan lsan"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Linux ASan Tests (sandboxed)"
+    name: "buildbucket/luci.chromium-m92.ci/Linux ASan Tests (sandboxed)"
     category: "linux|asan lsan"
     short_name: "sbx"
   }
@@ -1816,14 +1852,14 @@ consoles {
       show_primary_secondary_labels: true
     }
     console_groups {
-      console_ids: "chromium-m91/chromium"
-      console_ids: "chromium-m91/chromium.win"
-      console_ids: "chromium-m91/chromium.mac"
-      console_ids: "chromium-m91/chromium.linux"
-      console_ids: "chromium-m91/chromium.chromiumos"
-      console_ids: "chromium-m91/chromium.memory"
-      console_ids: "chromium-m91/chromium.gpu"
-      console_ids: "chromium-m91/chromium.android"
+      console_ids: "chromium-m92/chromium"
+      console_ids: "chromium-m92/chromium.win"
+      console_ids: "chromium-m92/chromium.mac"
+      console_ids: "chromium-m92/chromium.linux"
+      console_ids: "chromium-m92/chromium.chromiumos"
+      console_ids: "chromium-m92/chromium.memory"
+      console_ids: "chromium-m92/chromium.gpu"
+      console_ids: "chromium-m92/chromium.android"
     }
   }
 }
@@ -1831,30 +1867,30 @@ consoles {
   id: "chromium.win"
   name: "chromium.win"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4472"
+  refs: "regexp:refs/branch-heads/4515"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win x64 Builder"
+    name: "buildbucket/luci.chromium-m92.ci/Win x64 Builder"
     category: "release|builder"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win 7 Tests x64 (1)"
+    name: "buildbucket/luci.chromium-m92.ci/Win 7 Tests x64 (1)"
     category: "release|tester"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win10 Tests x64"
+    name: "buildbucket/luci.chromium-m92.ci/Win10 Tests x64"
     category: "release|tester"
     short_name: "w10"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win Builder (dbg)"
+    name: "buildbucket/luci.chromium-m92.ci/Win Builder (dbg)"
     category: "debug|builder"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.ci/Win7 Tests (dbg)(1)"
+    name: "buildbucket/luci.chromium-m92.ci/Win7 Tests (dbg)(1)"
     category: "debug|tester"
     short_name: "7"
   }
@@ -1869,14 +1905,14 @@ consoles {
       show_primary_secondary_labels: true
     }
     console_groups {
-      console_ids: "chromium-m91/chromium"
-      console_ids: "chromium-m91/chromium.win"
-      console_ids: "chromium-m91/chromium.mac"
-      console_ids: "chromium-m91/chromium.linux"
-      console_ids: "chromium-m91/chromium.chromiumos"
-      console_ids: "chromium-m91/chromium.memory"
-      console_ids: "chromium-m91/chromium.gpu"
-      console_ids: "chromium-m91/chromium.android"
+      console_ids: "chromium-m92/chromium"
+      console_ids: "chromium-m92/chromium.win"
+      console_ids: "chromium-m92/chromium.mac"
+      console_ids: "chromium-m92/chromium.linux"
+      console_ids: "chromium-m92/chromium.chromiumos"
+      console_ids: "chromium-m92/chromium.memory"
+      console_ids: "chromium-m92/chromium.gpu"
+      console_ids: "chromium-m92/chromium.android"
     }
   }
 }
@@ -1884,190 +1920,196 @@ consoles {
   id: "luci.chromium.try"
   name: "luci.chromium.try"
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-binary-size"
+    name: "buildbucket/luci.chromium-m92.try/android-binary-size"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m92.try/android-cronet-arm-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m92.try/android-lollipop-arm-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-cronet-arm-dbg"
+    name: "buildbucket/luci.chromium-m92.try/android-marshmallow-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-lollipop-arm-rel"
+    name: "buildbucket/luci.chromium-m92.try/android-marshmallow-x86-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-marshmallow-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.try/android-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-marshmallow-x86-rel"
+    name: "buildbucket/luci.chromium-m92.try/android-pie-arm64-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-official"
+    name: "buildbucket/luci.chromium-m92.try/android-pie-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-pie-arm64-dbg"
+    name: "buildbucket/luci.chromium-m92.try/android_compile_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-pie-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.try/android_compile_x64_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_compile_dbg"
+    name: "buildbucket/luci.chromium-m92.try/android_compile_x86_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_compile_x64_dbg"
+    name: "buildbucket/luci.chromium-m92.try/android_cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_compile_x86_dbg"
+    name: "buildbucket/luci.chromium-m92.try/android_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_cronet"
+    name: "buildbucket/luci.chromium-m92.try/cast_shell_android"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m92.try/cast_shell_linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/cast_shell_android"
+    name: "buildbucket/luci.chromium-m92.try/cast_shell_linux_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/cast_shell_linux"
+    name: "buildbucket/luci.chromium-m92.try/chromeos-amd64-generic-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromeos-amd64-generic-dbg"
+    name: "buildbucket/luci.chromium-m92.try/chromeos-amd64-generic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromeos-amd64-generic-rel"
+    name: "buildbucket/luci.chromium-m92.try/chromeos-arm-generic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromeos-arm-generic-rel"
+    name: "buildbucket/luci.chromium-m92.try/chromeos-kevin-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromeos-kevin-rel"
+    name: "buildbucket/luci.chromium-m92.try/chromium_presubmit"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromium_presubmit"
+    name: "buildbucket/luci.chromium-m92.try/dawn-linux-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/dawn-linux-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m92.try/dawn-mac-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/dawn-mac-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m92.try/dawn-win10-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/dawn-win10-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m92.try/dawn-win10-x86-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/dawn-win10-x86-deps-rel"
+    name: "buildbucket/luci.chromium-m92.try/fuchsia-arm64-cast"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/fuchsia-arm64-cast"
+    name: "buildbucket/luci.chromium-m92.try/fuchsia-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/fuchsia-official"
+    name: "buildbucket/luci.chromium-m92.try/fuchsia-x64-cast"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/fuchsia-x64-cast"
+    name: "buildbucket/luci.chromium-m92.try/fuchsia_arm64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/fuchsia_arm64"
+    name: "buildbucket/luci.chromium-m92.try/fuchsia_x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/fuchsia_x64"
+    name: "buildbucket/luci.chromium-m92.try/ios-simulator"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/ios-simulator"
+    name: "buildbucket/luci.chromium-m92.try/ios-simulator-cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/ios-simulator-cronet"
+    name: "buildbucket/luci.chromium-m92.try/ios-simulator-full-configs"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/ios-simulator-full-configs"
+    name: "buildbucket/luci.chromium-m92.try/linux-blink-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-blink-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-chromeos-compile-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-chromeos-compile-dbg"
+    name: "buildbucket/luci.chromium-m92.try/linux-chromeos-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-chromeos-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-libfuzzer-asan-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-libfuzzer-asan-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-official"
+    name: "buildbucket/luci.chromium-m92.try/linux-ozone-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-ozone-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-rel-compilator"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-rel-compilator"
+    name: "buildbucket/luci.chromium-m92.try/linux-rel-orchestrator"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-rel-orchestrator"
+    name: "buildbucket/luci.chromium-m92.try/linux-rel-reclient"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-rel-reclient"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_asan_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_chromium_asan_rel_ng"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_chromium_dbg_ng"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_tsan_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_chromium_tsan_rel_ng"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_tsan_rel_ng_bionic"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_layout_tests_composite_after_paint"
+    name: "buildbucket/luci.chromium-m92.try/linux_layout_tests_composite_after_paint"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_layout_tests_layout_ng_disabled"
+    name: "buildbucket/luci.chromium-m92.try/linux_layout_tests_layout_ng_disabled"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m92.try/linux_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_vr"
+    name: "buildbucket/luci.chromium-m92.try/linux_vr"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/mac-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.try/mac-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/mac-official"
+    name: "buildbucket/luci.chromium-m92.try/mac-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/mac-rel"
+    name: "buildbucket/luci.chromium-m92.try/mac-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/mac_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m92.try/mac_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/mac_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m92.try/mac_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win-libfuzzer-asan-rel"
+    name: "buildbucket/luci.chromium-m92.try/win-libfuzzer-asan-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win-official"
+    name: "buildbucket/luci.chromium-m92.try/win-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win10_chromium_x64_rel_ng"
+    name: "buildbucket/luci.chromium-m92.try/win10_chromium_x64_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win32-official"
+    name: "buildbucket/luci.chromium-m92.try/win32-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win7-rel"
+    name: "buildbucket/luci.chromium-m92.try/win7-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m92.try/win_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m92.try/win_optional_gpu_tests_rel"
   }
   builder_view_only: true
 }
@@ -2075,7 +2117,7 @@ consoles {
   id: "tryserver.blink"
   name: "tryserver.blink"
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-blink-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-blink-rel"
   }
   builder_view_only: true
 }
@@ -2083,22 +2125,22 @@ consoles {
   id: "tryserver.chromium"
   name: "tryserver.chromium"
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-official"
+    name: "buildbucket/luci.chromium-m92.try/android-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/fuchsia-official"
+    name: "buildbucket/luci.chromium-m92.try/fuchsia-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-official"
+    name: "buildbucket/luci.chromium-m92.try/linux-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/mac-official"
+    name: "buildbucket/luci.chromium-m92.try/mac-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win-official"
+    name: "buildbucket/luci.chromium-m92.try/win-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win32-official"
+    name: "buildbucket/luci.chromium-m92.try/win32-official"
   }
   builder_view_only: true
 }
@@ -2106,43 +2148,43 @@ consoles {
   id: "tryserver.chromium.android"
   name: "tryserver.chromium.android"
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-binary-size"
+    name: "buildbucket/luci.chromium-m92.try/android-binary-size"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-cronet-arm-dbg"
+    name: "buildbucket/luci.chromium-m92.try/android-cronet-arm-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-lollipop-arm-rel"
+    name: "buildbucket/luci.chromium-m92.try/android-lollipop-arm-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-marshmallow-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.try/android-marshmallow-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-marshmallow-x86-rel"
+    name: "buildbucket/luci.chromium-m92.try/android-marshmallow-x86-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-pie-arm64-dbg"
+    name: "buildbucket/luci.chromium-m92.try/android-pie-arm64-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android-pie-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.try/android-pie-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_compile_dbg"
+    name: "buildbucket/luci.chromium-m92.try/android_compile_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_compile_x64_dbg"
+    name: "buildbucket/luci.chromium-m92.try/android_compile_x64_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_compile_x86_dbg"
+    name: "buildbucket/luci.chromium-m92.try/android_compile_x86_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_cronet"
+    name: "buildbucket/luci.chromium-m92.try/android_cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/android_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m92.try/android_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/cast_shell_android"
+    name: "buildbucket/luci.chromium-m92.try/cast_shell_android"
   }
   builder_view_only: true
 }
@@ -2150,22 +2192,22 @@ consoles {
   id: "tryserver.chromium.chromiumos"
   name: "tryserver.chromium.chromiumos"
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromeos-amd64-generic-dbg"
+    name: "buildbucket/luci.chromium-m92.try/chromeos-amd64-generic-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromeos-amd64-generic-rel"
+    name: "buildbucket/luci.chromium-m92.try/chromeos-amd64-generic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromeos-arm-generic-rel"
+    name: "buildbucket/luci.chromium-m92.try/chromeos-arm-generic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromeos-kevin-rel"
+    name: "buildbucket/luci.chromium-m92.try/chromeos-kevin-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-chromeos-compile-dbg"
+    name: "buildbucket/luci.chromium-m92.try/linux-chromeos-compile-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-chromeos-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-chromeos-rel"
   }
   builder_view_only: true
 }
@@ -2173,16 +2215,16 @@ consoles {
   id: "tryserver.chromium.dawn"
   name: "tryserver.chromium.dawn"
   builders {
-    name: "buildbucket/luci.chromium-m91.try/dawn-linux-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m92.try/dawn-linux-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/dawn-mac-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m92.try/dawn-mac-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/dawn-win10-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m92.try/dawn-win10-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/dawn-win10-x86-deps-rel"
+    name: "buildbucket/luci.chromium-m92.try/dawn-win10-x86-deps-rel"
   }
   builder_view_only: true
 }
@@ -2190,64 +2232,70 @@ consoles {
   id: "tryserver.chromium.linux"
   name: "tryserver.chromium.linux"
   builders {
-    name: "buildbucket/luci.chromium-m91.try/cast_shell_linux"
+    name: "buildbucket/luci.chromium-m92.try/cast_shell_linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m92.try/cast_shell_linux_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m92.try/chromium_presubmit"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/chromium_presubmit"
+    name: "buildbucket/luci.chromium-m92.try/fuchsia-arm64-cast"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/fuchsia-arm64-cast"
+    name: "buildbucket/luci.chromium-m92.try/fuchsia-x64-cast"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/fuchsia-x64-cast"
+    name: "buildbucket/luci.chromium-m92.try/fuchsia_arm64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/fuchsia_arm64"
+    name: "buildbucket/luci.chromium-m92.try/fuchsia_x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/fuchsia_x64"
+    name: "buildbucket/luci.chromium-m92.try/linux-libfuzzer-asan-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-libfuzzer-asan-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-ozone-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-ozone-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-rel"
+    name: "buildbucket/luci.chromium-m92.try/linux-rel-compilator"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-rel-compilator"
+    name: "buildbucket/luci.chromium-m92.try/linux-rel-orchestrator"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-rel-orchestrator"
+    name: "buildbucket/luci.chromium-m92.try/linux-rel-reclient"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux-rel-reclient"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_asan_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_chromium_asan_rel_ng"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_chromium_dbg_ng"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_tsan_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_chromium_tsan_rel_ng"
+    name: "buildbucket/luci.chromium-m92.try/linux_chromium_tsan_rel_ng_bionic"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_layout_tests_composite_after_paint"
+    name: "buildbucket/luci.chromium-m92.try/linux_layout_tests_composite_after_paint"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_layout_tests_layout_ng_disabled"
+    name: "buildbucket/luci.chromium-m92.try/linux_layout_tests_layout_ng_disabled"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m92.try/linux_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/linux_vr"
+    name: "buildbucket/luci.chromium-m92.try/linux_vr"
   }
   builder_view_only: true
 }
@@ -2255,25 +2303,25 @@ consoles {
   id: "tryserver.chromium.mac"
   name: "tryserver.chromium.mac"
   builders {
-    name: "buildbucket/luci.chromium-m91.try/ios-simulator"
+    name: "buildbucket/luci.chromium-m92.try/ios-simulator"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/ios-simulator-cronet"
+    name: "buildbucket/luci.chromium-m92.try/ios-simulator-cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/ios-simulator-full-configs"
+    name: "buildbucket/luci.chromium-m92.try/ios-simulator-full-configs"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/mac-arm64-rel"
+    name: "buildbucket/luci.chromium-m92.try/mac-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/mac-rel"
+    name: "buildbucket/luci.chromium-m92.try/mac-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/mac_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m92.try/mac_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/mac_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m92.try/mac_optional_gpu_tests_rel"
   }
   builder_view_only: true
 }
@@ -2281,19 +2329,19 @@ consoles {
   id: "tryserver.chromium.win"
   name: "tryserver.chromium.win"
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win-libfuzzer-asan-rel"
+    name: "buildbucket/luci.chromium-m92.try/win-libfuzzer-asan-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win10_chromium_x64_rel_ng"
+    name: "buildbucket/luci.chromium-m92.try/win10_chromium_x64_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win7-rel"
+    name: "buildbucket/luci.chromium-m92.try/win7-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m92.try/win_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m91.try/win_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m92.try/win_optional_gpu_tests_rel"
   }
   builder_view_only: true
 }
diff --git a/chromium/infra/config/generated/luci-notify.cfg b/chromium/infra/config/generated/luci-notify.cfg
index eb5774104d1..e61ed0c1b40 100644
--- a/chromium/infra/config/generated/luci-notify.cfg
+++ b/chromium/infra/config/generated/luci-notify.cfg
@@ -79,6 +79,16 @@ notifiers {
   notifications {
     on_new_status: INFRA_FAILURE
   }
+  builders {
+    bucket: "ci"
+    name: "Cast Linux Debug"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+  }
   notifications {
     on_new_status: INFRA_FAILURE
   }
@@ -311,6 +321,16 @@ notifiers {
   notifications {
     on_new_status: INFRA_FAILURE
   }
+  builders {
+    bucket: "ci"
+    name: "Linux TSan (bionic)"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+  }
   notifications {
     on_new_status: INFRA_FAILURE
   }
@@ -604,7 +624,7 @@ notifiers {
   notifications {
     on_change: true
     email {
-      recipients: "cronet-bots-observer@google.com"
+      recipients: "cronet-sheriff@grotations.appspotmail.com"
     }
   }
   builders {
@@ -617,7 +637,7 @@ notifiers {
   notifications {
     on_change: true
     email {
-      recipients: "cronet-bots-observer@google.com"
+      recipients: "cronet-sheriff@grotations.appspotmail.com"
     }
   }
   builders {
@@ -630,7 +650,7 @@ notifiers {
   notifications {
     on_change: true
     email {
-      recipients: "cronet-bots-observer@google.com"
+      recipients: "cronet-sheriff@grotations.appspotmail.com"
     }
   }
   builders {
@@ -642,7 +662,7 @@ notifiers {
   notifications {
     on_change: true
     email {
-      recipients: "cronet-bots-observer@google.com"
+      recipients: "cronet-sheriff@grotations.appspotmail.com"
     }
   }
   builders {
@@ -811,7 +831,7 @@ notifiers {
   notifications {
     on_change: true
     email {
-      recipients: "cronet-bots-observer@google.com"
+      recipients: "cronet-sheriff@grotations.appspotmail.com"
     }
   }
   builders {
diff --git a/chromium/infra/config/generated/luci-scheduler.cfg b/chromium/infra/config/generated/luci-scheduler.cfg
index be7f5c662e0..4d87333da96 100644
--- a/chromium/infra/config/generated/luci-scheduler.cfg
+++ b/chromium/infra/config/generated/luci-scheduler.cfg
@@ -10,7 +10,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Android Release (Nexus 5X)"
   }
 }
@@ -24,7 +24,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Android WebView M (dbg)"
   }
 }
@@ -38,7 +38,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Android WebView N (dbg)"
   }
 }
@@ -52,7 +52,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Android WebView O (dbg)"
   }
 }
@@ -66,7 +66,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Android WebView P (dbg)"
   }
 }
@@ -76,7 +76,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Android arm Builder (dbg)"
   }
 }
@@ -86,7 +86,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Android arm64 Builder (dbg)"
   }
 }
@@ -96,7 +96,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Android x64 Builder (dbg)"
   }
 }
@@ -106,7 +106,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Android x86 Builder (dbg)"
   }
 }
@@ -116,7 +116,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Cast Android (dbg)"
   }
 }
@@ -126,17 +126,27 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Cast Linux"
   }
 }
 job {
+  id: "Cast Linux Debug"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium-m92.ci"
+    builder: "Cast Linux Debug"
+  }
+}
+job {
   id: "Dawn Linux x64 DEPS Builder"
   realm: "ci"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Dawn Linux x64 DEPS Builder"
   }
 }
@@ -150,7 +160,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Dawn Linux x64 DEPS Release (Intel HD 630)"
   }
 }
@@ -164,7 +174,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Dawn Linux x64 DEPS Release (NVIDIA)"
   }
 }
@@ -174,7 +184,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Dawn Mac x64 DEPS Builder"
   }
 }
@@ -188,7 +198,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Dawn Mac x64 DEPS Release (AMD)"
   }
 }
@@ -202,7 +212,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Dawn Mac x64 DEPS Release (Intel)"
   }
 }
@@ -212,7 +222,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Dawn Win10 x64 DEPS Builder"
   }
 }
@@ -226,7 +236,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Dawn Win10 x64 DEPS Release (Intel HD 630)"
   }
 }
@@ -240,7 +250,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Dawn Win10 x64 DEPS Release (NVIDIA)"
   }
 }
@@ -250,7 +260,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Dawn Win10 x86 DEPS Builder"
   }
 }
@@ -264,7 +274,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Dawn Win10 x86 DEPS Release (Intel HD 630)"
   }
 }
@@ -278,7 +288,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Dawn Win10 x86 DEPS Release (NVIDIA)"
   }
 }
@@ -288,7 +298,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Fuchsia ARM64"
   }
 }
@@ -298,7 +308,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Fuchsia x64"
   }
 }
@@ -308,7 +318,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "GPU Linux Builder"
   }
 }
@@ -318,7 +328,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "GPU Mac Builder"
   }
 }
@@ -328,7 +338,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "GPU Win x64 Builder"
   }
 }
@@ -338,7 +348,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux ASan LSan Builder"
   }
 }
@@ -352,7 +362,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux ASan LSan Tests (1)"
   }
 }
@@ -366,7 +376,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux ASan Tests (sandboxed)"
   }
 }
@@ -376,7 +386,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux Builder"
   }
 }
@@ -386,7 +396,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux Builder (dbg)"
   }
 }
@@ -400,7 +410,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux Ozone Tester (Headless)"
   }
 }
@@ -414,7 +424,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux Ozone Tester (Wayland)"
   }
 }
@@ -428,7 +438,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux Ozone Tester (X11)"
   }
 }
@@ -442,17 +452,27 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux Release (NVIDIA)"
   }
 }
 job {
+  id: "Linux TSan (bionic)"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium-m92.ci"
+    builder: "Linux TSan (bionic)"
+  }
+}
+job {
   id: "Linux TSan Builder"
   realm: "ci"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux TSan Builder"
   }
 }
@@ -466,7 +486,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux TSan Tests"
   }
 }
@@ -480,7 +500,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux Tester (Ozone Headless)"
   }
 }
@@ -494,7 +514,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux Tester (Ozone Wayland)"
   }
 }
@@ -508,7 +528,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux Tester (Ozone X11)"
   }
 }
@@ -522,7 +542,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux Tests"
   }
 }
@@ -536,7 +556,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Linux Tests (dbg)(1)"
   }
 }
@@ -546,7 +566,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Mac Builder"
   }
 }
@@ -556,7 +576,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Mac Builder (dbg)"
   }
 }
@@ -570,7 +590,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Mac Release (Intel)"
   }
 }
@@ -584,7 +604,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Mac Retina Release (AMD)"
   }
 }
@@ -598,7 +618,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Mac10.11 Tests"
   }
 }
@@ -612,7 +632,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Mac10.12 Tests"
   }
 }
@@ -626,7 +646,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Mac10.13 Tests"
   }
 }
@@ -640,7 +660,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Mac10.14 Tests"
   }
 }
@@ -654,7 +674,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Mac10.15 Tests"
   }
 }
@@ -668,7 +688,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Mac10.15 Tests (dbg)"
   }
 }
@@ -682,7 +702,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Marshmallow 64 bit Tester"
   }
 }
@@ -696,7 +716,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Nougat Phone Tester"
   }
 }
@@ -710,7 +730,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Oreo Phone Tester"
   }
 }
@@ -720,7 +740,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "VR Linux"
   }
 }
@@ -730,7 +750,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "VR Linux (reclient)"
   }
 }
@@ -744,7 +764,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Win 7 Tests x64 (1)"
   }
 }
@@ -754,7 +774,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Win Builder (dbg)"
   }
 }
@@ -764,7 +784,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Win x64 Builder"
   }
 }
@@ -778,7 +798,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Win10 Tests x64"
   }
 }
@@ -792,7 +812,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Win10 x64 Release (NVIDIA)"
   }
 }
@@ -806,7 +826,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "Win7 Tests (dbg)(1)"
   }
 }
@@ -816,7 +836,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "android-cronet-arm-dbg"
   }
 }
@@ -826,7 +846,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "android-cronet-arm-rel"
   }
 }
@@ -840,7 +860,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "android-cronet-arm-rel-kitkat-tests"
   }
 }
@@ -854,7 +874,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "android-cronet-arm-rel-lollipop-tests"
   }
 }
@@ -864,7 +884,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "android-lollipop-arm-rel"
   }
 }
@@ -874,7 +894,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "android-marshmallow-arm64-rel"
   }
 }
@@ -884,7 +904,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "android-marshmallow-x86-rel"
   }
 }
@@ -894,7 +914,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "android-nougat-arm64-rel"
   }
 }
@@ -904,7 +924,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "android-official"
   }
 }
@@ -918,7 +938,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "android-pie-arm64-dbg"
   }
 }
@@ -928,7 +948,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "android-pie-arm64-rel"
   }
 }
@@ -938,7 +958,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "chromeos-amd64-generic-dbg"
   }
 }
@@ -948,7 +968,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "chromeos-amd64-generic-lacros-dbg"
   }
 }
@@ -958,7 +978,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "chromeos-amd64-generic-rel"
   }
 }
@@ -968,7 +988,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "chromeos-arm-generic-rel"
   }
 }
@@ -978,7 +998,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "chromeos-kevin-rel"
   }
 }
@@ -988,7 +1008,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "fuchsia-arm64-cast"
   }
 }
@@ -998,7 +1018,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "fuchsia-official"
   }
 }
@@ -1008,7 +1028,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "fuchsia-x64-cast"
   }
 }
@@ -1018,7 +1038,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "ios-simulator"
   }
 }
@@ -1028,7 +1048,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "ios-simulator-cronet"
   }
 }
@@ -1038,7 +1058,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "ios-simulator-full-configs"
   }
 }
@@ -1048,7 +1068,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "linux-chromeos-dbg"
   }
 }
@@ -1058,7 +1078,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "linux-chromeos-rel"
   }
 }
@@ -1068,7 +1088,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "linux-lacros-builder-rel"
   }
 }
@@ -1082,7 +1102,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "linux-lacros-tester-rel"
   }
 }
@@ -1092,7 +1112,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "linux-official"
   }
 }
@@ -1102,7 +1122,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "linux-ozone-rel"
   }
 }
@@ -1112,7 +1132,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "mac-arm64-rel"
   }
 }
@@ -1122,7 +1142,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "win-official"
   }
 }
@@ -1132,7 +1152,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
+    bucket: "luci.chromium-m92.ci"
     builder: "win32-official"
   }
 }
@@ -1167,26 +1187,6 @@ job {
   noop {}
 }
 job {
-  id: "Win10 Tests x64 1803"
-  schedule: "triggered"
-  acls {
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  }
-  acl_sets: "ci"
-  noop {}
-}
-job {
-  id: "Win10 Tests x64 1909"
-  schedule: "triggered"
-  acls {
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  }
-  acl_sets: "ci"
-  noop {}
-}
-job {
   id: "Win10 Tests x64 20h2"
   schedule: "triggered"
   acls {
@@ -1247,6 +1247,7 @@ trigger {
   triggers: "Android x86 Builder (dbg)"
   triggers: "Cast Android (dbg)"
   triggers: "Cast Linux"
+  triggers: "Cast Linux Debug"
   triggers: "Dawn Linux x64 DEPS Builder"
   triggers: "Dawn Mac x64 DEPS Builder"
   triggers: "Dawn Win10 x64 DEPS Builder"
@@ -1259,6 +1260,7 @@ trigger {
   triggers: "Linux ASan LSan Builder"
   triggers: "Linux Builder"
   triggers: "Linux Builder (dbg)"
+  triggers: "Linux TSan (bionic)"
   triggers: "Linux TSan Builder"
   triggers: "Mac Builder"
   triggers: "Mac Builder (dbg)"
@@ -1295,7 +1297,7 @@ trigger {
   triggers: "win32-official"
   gitiles {
     repo: "https://chromium.googlesource.com/chromium/src"
-    refs: "regexp:refs/branch-heads/4472"
+    refs: "regexp:refs/branch-heads/4515"
   }
 }
 acl_sets {
diff --git a/chromium/infra/config/generated/project.cfg b/chromium/infra/config/generated/project.cfg
index 86914e683de..d3fb41c1641 100644
--- a/chromium/infra/config/generated/project.cfg
+++ b/chromium/infra/config/generated/project.cfg
@@ -4,5 +4,5 @@
 # For the schema of this file, see ProjectCfg message:
 #   https://luci-config.appspot.com/schemas/projects:project.cfg
 
-name: "chromium-m91"
+name: "chromium-m92"
 access: "group:all"
diff --git a/chromium/infra/config/generated/realms.cfg b/chromium/infra/config/generated/realms.cfg
index 028c5af8673..e019dcbff91 100644
--- a/chromium/infra/config/generated/realms.cfg
+++ b/chromium/infra/config/generated/realms.cfg
@@ -55,6 +55,7 @@ realms {
   bindings {
     role: "role/buildbucket.triggerer"
     principals: "group:project-chromium-ci-schedulers"
+    principals: "user:chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com"
   }
   bindings {
     role: "role/resultdb.invocationCreator"
diff --git a/chromium/infra/config/generators/scheduler-noop-jobs.star b/chromium/infra/config/generators/scheduler-noop-jobs.star
index 824db1b6501..e4e63bfe8d2 100644
--- a/chromium/infra/config/generators/scheduler-noop-jobs.star
+++ b/chromium/infra/config/generators/scheduler-noop-jobs.star
@@ -14,39 +14,38 @@ without error.
 
 # Don't make a habit of this - it isn't public API
 load("@stdlib//internal/luci/proto.star", "scheduler_pb")
+load("//lib/branches.star", "branches")
 load("//project.star", "settings")
 
-_NON_BRANCHED_TESTERS = (
+_NON_BRANCHED_TESTERS = {
     # This tester is triggered by 'Mac Builder', but it is an FYI builder and
     # not mirrored by any branched try builders, so we do not need to run it on
     # the branches
-    "mac-osxbeta-rel",
+    "mac-osxbeta-rel": branches.STANDARD_MILESTONE,
 
     # This tester is also triggered by 'Mac Builder', but we don't have enough
     # capacity on Mac 11 to run this on the branches yet.
     # TODO(crbug.com/1206401): Restore this when we do have capacity.
-    "Mac11 Tests",
+    "Mac11 Tests": branches.STANDARD_MILESTONE,
 
     # This tester is triggered by 'mac-arm64-rel', but it is an FYI builder and
     # not mirrored by any branched try builders and we have limited test
     # capacity, so we do not need to run it on the branches
-    "mac-arm64-rel-tests",
+    "mac-arm64-rel-tests": branches.STANDARD_MILESTONE,
 
-    # These testers are triggered by 'Win x64 Builder', but it is an FYI builder
+    # This tester is triggered by 'Win x64 Builder', but it is an FYI builder
     # and not mirrored by any branched try builders, so we do not need to run it
-    # on the branches (crbug/990885)
-    "Win10 Tests x64 1803",
-    "Win10 Tests x64 1909",
-    "Win10 Tests x64 20h2",
+    # on the branches
+    "Win10 Tests x64 20h2": branches.STANDARD_MILESTONE,
 
     # These Android testers are triggered by 'Android arm Builder (dbg)', but we
     # don't have sufficient capacity of devices with older Android versions, so
     # we do not run them on the branches
-    "Android WebView L (dbg)",
-    "Lollipop Phone Tester",
-    "Lollipop Tablet Tester",
-    "Marshmallow Tablet Tester",
-)
+    "Android WebView L (dbg)": branches.STANDARD_MILESTONE,
+    "Lollipop Phone Tester": branches.STANDARD_MILESTONE,
+    "Lollipop Tablet Tester": branches.STANDARD_MILESTONE,
+    "Marshmallow Tablet Tester": branches.STANDARD_MILESTONE,
+}
 
 _TESTER_NOOP_JOBS = [scheduler_pb.Job(
     id = builder,
@@ -57,7 +56,7 @@ _TESTER_NOOP_JOBS = [scheduler_pb.Job(
         granted_to = "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
     )],
     noop = scheduler_pb.NoopTask(),
-) for builder in _NON_BRANCHED_TESTERS]
+) for builder, selector in _NON_BRANCHED_TESTERS.items() if branches.matches(selector)]
 
 def _add_noop_jobs(ctx):
     if settings.is_main:
diff --git a/chromium/infra/config/groups/ios/OWNERS b/chromium/infra/config/groups/ios/OWNERS
new file mode 100644
index 00000000000..ebdd93e6484
--- /dev/null
+++ b/chromium/infra/config/groups/ios/OWNERS
@@ -0,0 +1,4 @@
+jeffyoon@google.com
+lindsayw@chromium.org
+zhaoyangli@chromium.org
+zhaoyangli@google.com
diff --git a/chromium/infra/config/lib/branches.star b/chromium/infra/config/lib/branches.star
index ce33e32180f..0b9c6258bd7 100644
--- a/chromium/infra/config/lib/branches.star
+++ b/chromium/infra/config/lib/branches.star
@@ -73,14 +73,21 @@ def _matches(branch_selector):
                 .format(_BRANCH_SELECTORS, b))
     return False
 
-def _value(*, for_main = None, for_branches = None):
-    """Provide a value that varies between main/master/trunk and branches.
-
-    If the current project settings indicate that this is main/master/trunk,
-    then `for_main` will be returned. Otherwise, `for_branches` will be
-    returned.
+def _value(values, *, default = None):
+    """Provide a value that varies depending on the project settings.
+
+    Args:
+      values - A mapping from branch selectors to the value to be used for the
+        matching branches. The keys can be either a single selector or a tuple
+        of selectors. The selectors will be matched in the order declared in the
+        mapping.
+      default - The value to be returned if the project settings don't match any
+        of the branch selectors in the keys of `values`.
     """
-    return for_main if settings.is_main else for_branches
+    for selector, value in values.items():
+        if _matches(selector):
+            return value
+    return default
 
 def _exec(module, *, branch_selector = MAIN):
     """Execute `module` if `branch_selector` matches the project settings."""
@@ -103,12 +110,12 @@ branches = struct(
     LTS_BRANCHES = LTS_BRANCHES,
 
     # Branch selectors for tracking milestones through release channels
-    STANDARD_MILESTONE = [MAIN, STANDARD_BRANCHES],
-    LTS_MILESTONE = [MAIN, STANDARD_BRANCHES, LTS_BRANCHES],
+    STANDARD_MILESTONE = (MAIN, STANDARD_BRANCHES),
+    LTS_MILESTONE = (MAIN, STANDARD_BRANCHES, LTS_BRANCHES),
 
     # Branch selectors to apply widely to branches
     ALL_BRANCHES = _BRANCH_SELECTORS,
-    NOT_MAIN = [b for b in _BRANCH_SELECTORS if b != MAIN],
+    NOT_MAIN = tuple([b for b in _BRANCH_SELECTORS if b != MAIN]),
 
     # Branch functions
     matches = _matches,
diff --git a/chromium/infra/config/lib/builders.star b/chromium/infra/config/lib/builders.star
index e995cf20def..04187ee86e0 100644
--- a/chromium/infra/config/lib/builders.star
+++ b/chromium/infra/config/lib/builders.star
@@ -28,6 +28,7 @@ through `builders.cpu`, `builders.os` and `builders.goma` respectively.
 load("//project.star", "settings")
 load("./args.star", "args")
 load("./branches.star", "branches")
+load("./listify.star", "listify")
 
 ################################################################################
 # Constants for use with the builder function                                  #
@@ -98,7 +99,7 @@ os = struct(
     WINDOWS_8_1 = os_enum("Windows-8.1", os_category.WINDOWS),
     WINDOWS_10 = os_enum("Windows-10", os_category.WINDOWS),
     WINDOWS_10_1703 = os_enum("Windows-10-15063", os_category.WINDOWS),
-    WINDOWS_10_1909 = os_enum("Windows-10-18363", os_category.WINDOWS),
+    WINDOWS_10_20h2 = os_enum("Windows-10-19042", os_category.WINDOWS),
     WINDOWS_DEFAULT = os_enum("Windows-10", os_category.WINDOWS),
     WINDOWS_ANY = os_enum("Windows", os_category.WINDOWS),
 )
@@ -150,6 +151,19 @@ goma = struct(
     ),
 )
 
+def _rotation(name):
+    return branches.value({branches.MAIN: [name]})
+
+# Sheriff rotations that a builder can be added to (only takes effect on trunk)
+# Arbitrary elements can't be added, new rotations must be added in SoM code
+sheriff_rotations = struct(
+    ANDROID = _rotation("android"),
+    CHROMIUM = _rotation("chromium"),
+    CHROMIUM_CLANG = _rotation("chromium.clang"),
+    CHROMIUM_GPU = _rotation("chromium.gpu"),
+    IOS = _rotation("ios"),
+)
+
 def xcode_enum(version):
     return struct(
         version = version,
@@ -167,6 +181,8 @@ xcode = struct(
     x12a7209 = xcode_enum("12a7209"),
     # (current default for iOS) xc12.4 gm seed
     x12d4e = xcode_enum("12d4e"),
+    # Xcode 12.5. Requires Mac11+ OS.
+    x12e262 = xcode_enum("12e262"),
 )
 
 ################################################################################
@@ -188,31 +204,20 @@ def _chromium_tests_property(*, project_trigger_overrides):
 
     return chromium_tests or None
 
-def _goma_property(*, goma_backend, goma_debug, goma_enable_ats, goma_jobs, os):
+def _goma_property(*, goma_backend, goma_debug, goma_enable_ats, goma_jobs):
     goma_properties = {}
 
     goma_backend = defaults.get_value("goma_backend", goma_backend)
-    if goma_backend != None:
-        goma_properties.update(goma_backend)
+    if goma_backend == None:
+        return None
+    goma_properties.update(goma_backend)
 
     goma_debug = defaults.get_value("goma_debug", goma_debug)
     if goma_debug:
         goma_properties["debug"] = True
 
-    goma_enable_ats = defaults.get_value("goma_enable_ats", goma_enable_ats)
-
-    # TODO(crbug.com/1040754): Remove this flag.
-    if goma_enable_ats == args.COMPUTE:
-        goma_enable_ats = (
-            os and os.category in (os_category.LINUX, os_category.WINDOWS) and
-            goma_backend in (
-                goma.backend.RBE_TOT,
-                goma.backend.RBE_STAGING,
-                goma.backend.RBE_PROD,
-            )
-        )
-    if goma_enable_ats:
-        goma_properties["enable_ats"] = True
+    if goma_enable_ats != None:
+        goma_properties["enable_ats"] = goma_enable_ats
 
     goma_jobs = defaults.get_value("goma_jobs", goma_jobs)
     if goma_jobs != None:
@@ -317,6 +322,7 @@ defaults = args.defaults(
     os = None,
     project_trigger_overrides = None,
     pool = None,
+    sheriff_rotations = None,
     xcode = None,
     ssd = args.COMPUTE,
     use_clang_coverage = False,
@@ -355,6 +361,7 @@ def builder(
         builder_group = args.DEFAULT,
         pool = args.DEFAULT,
         ssd = args.DEFAULT,
+        sheriff_rotations = None,
         xcode = args.DEFAULT,
         console_view_entry = None,
         list_view = args.DEFAULT,
@@ -377,6 +384,7 @@ def builder(
         reclient_service = args.DEFAULT,
         reclient_jobs = args.DEFAULT,
         reclient_rewrapper_env = args.DEFAULT,
+        experiments = None,
         **kwargs):
     """Define a builder.
 
@@ -432,6 +440,9 @@ def builder(
         If True, emits a 'ssd:1' dimension. If False, emits a 'ssd:0' parameter.
         By default, considered False if builderless is considered True and
         otherwise None.
+      * sheriff_rotations - A string or list of strings identifying the sheriff
+        rotations that the builder should be included in. Will be merged with
+        the module-level default.
       * xcode - a member of the `xcode` enum indicating the xcode version the
         builder requires. Emits a cache declaration of the form
         ```{
@@ -463,8 +474,14 @@ def builder(
         True, the 'debug' field will be set in the '$build/goma' property. By
         default, considered False.
       * goma_enable_ats - a boolean indicating whether ats should be enabled for
-        goma. If True, the 'enable_ats' field will be set in the '$build/goma'
-        property. By default, considered False.
+        goma or args.COMPUTE if ats should be enabled where it is needed.
+        If True or False are explicitly set, the 'enable_ats' field will be set
+        in the '$build/goma' property.  By default, args.COMPUTE is set and
+        'enable_ats' fields is set only if ats need to be enabled by default.
+        The 'enable_ats' on Windows will control cross compiling in server
+        side. cross compile if `enable_ats` is False.
+        Note: if goma_enable_ats is not set, goma recipe modules sets
+        GOMA_ARBITRARY_TOOLCHAIN_SUPPORT=true on windows by default.
       * goma_jobs - a member of the `goma.jobs` enum indicating the number of jobs
         to be used by the builder. Sets the 'jobs' field of the '$build/goma'
         property will be set according to the enum member. By default, the 'jobs'
@@ -503,6 +520,8 @@ def builder(
         compilations to run when using re-client as the compiler.
       * reclient_rewrapper_env - a map that sets the rewrapper flags via the
         environment variables. All such vars must start with the "RBE_" prefix.
+      * experiments - a dict of experiment name to the percentage chance (0-100)
+        that it will apply to builds generated from this builder.
       * kwargs - Additional keyword arguments to forward on to `luci.builder`.
     """
 
@@ -515,6 +534,9 @@ def builder(
     dimensions = {}
 
     properties = kwargs.pop("properties", {})
+    if "sheriff_rotations" in properties:
+        fail('Setting "sheriff_rotations" property is not supported: ' +
+             "use sheriff_rotations instead")
     if "$kitchen" in properties:
         fail('Setting "$kitchen" property is not supported: ' +
              "use configure_kitchen instead")
@@ -578,6 +600,10 @@ def builder(
     if pool:
         dimensions["pool"] = pool
 
+    sheriff_rotations = listify(defaults.sheriff_rotations.get(), sheriff_rotations)
+    if sheriff_rotations:
+        properties["sheriff_rotations"] = sheriff_rotations
+
     ssd = defaults.get_value("ssd", ssd)
     if ssd == args.COMPUTE:
         ssd = None
@@ -587,6 +613,14 @@ def builder(
     if ssd != None:
         dimensions["ssd"] = str(int(ssd))
 
+    # TODO(crbug.com/1143122): remove this.
+    experiments = experiments or {}
+    if os and os.category == os_category.MAC:
+        experiments["chromium.chromium_tests.use_rbe_cas"] = 50
+    elif os and os.category == os_category.WINDOWS:
+        experiments["chromium.chromium_tests.use_rbe_cas"] = 20
+    kwargs["experiments"] = experiments
+
     configure_kitchen = defaults.get_value("configure_kitchen", configure_kitchen)
     if configure_kitchen:
         properties["$kitchen"] = {
@@ -602,15 +636,22 @@ def builder(
     if chromium_tests != None:
         properties["$build/chromium_tests"] = chromium_tests
 
-    goma = _goma_property(
+    goma_enable_ats = defaults.get_value("goma_enable_ats", goma_enable_ats)
+
+    # Enable ATS on linux by default.
+    if goma_enable_ats == args.COMPUTE:
+        if os and os.category == os_category.LINUX:
+            goma_enable_ats = True
+        else:
+            goma_enable_ats = None
+    gp = _goma_property(
         goma_backend = goma_backend,
         goma_debug = goma_debug,
         goma_enable_ats = goma_enable_ats,
         goma_jobs = goma_jobs,
-        os = os,
     )
-    if goma != None:
-        properties["$build/goma"] = goma
+    if gp != None:
+        properties["$build/goma"] = gp
 
     code_coverage = _code_coverage_property(
         use_clang_coverage = use_clang_coverage,
@@ -737,5 +778,6 @@ builders = struct(
     defaults = defaults,
     goma = goma,
     os = os,
+    sheriff_rotations = sheriff_rotations,
     xcode = xcode,
 )
diff --git a/chromium/infra/config/lib/ci.star b/chromium/infra/config/lib/ci.star
index 30d0faa1b1f..06855e21e0c 100644
--- a/chromium/infra/config/lib/ci.star
+++ b/chromium/infra/config/lib/ci.star
@@ -15,7 +15,8 @@ to set the default value. Can also be accessed through `ci.defaults`.
 
 load("./args.star", "args")
 load("./branches.star", "branches")
-load("./builders.star", "builders", "os")
+load("./builders.star", "builders", "os", "os_category")
+load("./listify.star", "listify")
 
 defaults = args.defaults(
     extends = builders.defaults,
@@ -30,6 +31,7 @@ def ci_builder(
         console_view_entry = None,
         main_console_view = args.DEFAULT,
         cq_mirrors_console_view = args.DEFAULT,
+        sheriff_rotations = None,
         tree_closing = False,
         notifies = None,
         resultdb_bigquery_exports = None,
@@ -63,8 +65,8 @@ def ci_builder(
         specifying additional parameters for exporting test results to BigQuery.
         Will always upload to the following tables in addition to any tables
         specified by the list's elements:
-          luci-resultdb.chromium.ci_test_results
-          luci-resultdb.chromium.gpu_ci_test_results
+          chrome-luci-data.chromium.ci_test_results
+          chrome-luci-data.chromium.gpu_ci_test_results
       experiments - a dict of experiment name to the percentage chance (0-100)
         that it will apply to builds generated from this builder.
     """
@@ -78,26 +80,49 @@ def ci_builder(
         notifies = (notifies or []) + ["chromium-tree-closer", "chromium-tree-closer-email"]
 
     merged_resultdb_bigquery_exports = [
+        # TODO(crbug.com/1230801): Remove when all usages of this table have
+        # been migrated to `chrome-luci-data.chromium.ci_test_results`.
         resultdb.export_test_results(
             bq_table = "luci-resultdb.chromium.ci_test_results",
         ),
         resultdb.export_test_results(
-            bq_table = "luci-resultdb.chromium.gpu_ci_test_results",
+            bq_table = "chrome-luci-data.chromium.ci_test_results",
+        ),
+        resultdb.export_test_results(
+            bq_table = "chrome-luci-data.chromium.gpu_ci_test_results",
             predicate = resultdb.test_result_predicate(
                 # Only match the telemetry_gpu_integration_test and
                 # fuchsia_telemetry_gpu_integration_test targets.
-                test_id_regexp = "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+",
+                # Android Telemetry targets also have a suffix added to the end
+                # denoting the binary that's included, so also catch those with
+                # [^/]*.
+                test_id_regexp = "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+",
             ),
         ),
     ]
     merged_resultdb_bigquery_exports.extend(resultdb_bigquery_exports or [])
 
+    sheriff_rotations = listify(
+        sheriff_rotations,
+        # All CI builders on standard branches should be part of the
+        # chrome_browser_release sheriff rotation
+        branches.value({branches.STANDARD_BRANCHES: "chrome_browser_release"}),
+    )
+
     # Enable "chromium.resultdb.result_sink" on ci builders.
     experiments = experiments or {}
     experiments.setdefault("chromium.resultdb.result_sink", 100)
     experiments.setdefault("chromium.resultdb.result_sink.junit_tests", 100)
     experiments.setdefault("chromium.resultdb.result_sink.gtests_local", 100)
 
+    goma_enable_ats = defaults.get_value_from_kwargs("goma_enable_ats", kwargs)
+    if goma_enable_ats == args.COMPUTE:
+        os = defaults.get_value_from_kwargs("os", kwargs)
+
+        # in CI, enable ATS on windows.
+        if os and os.category == os_category.WINDOWS:
+            kwargs["goma_enable_ats"] = True
+
     # Define the builder first so that any validation of luci.builder arguments
     # (e.g. bucket) occurs before we try to use it
     builders.builder(
@@ -105,6 +130,7 @@ def ci_builder(
         branch_selector = branch_selector,
         console_view_entry = console_view_entry,
         resultdb_bigquery_exports = merged_resultdb_bigquery_exports,
+        sheriff_rotations = sheriff_rotations,
         notifies = notifies,
         experiments = experiments,
         resultdb_index_by_timestamp = True,
@@ -164,6 +190,7 @@ def android_builder(
         builder_group = "chromium.android",
         goma_backend = builders.goma.backend.RBE_PROD,
         goma_jobs = goma_jobs,
+        sheriff_rotations = builders.sheriff_rotations.ANDROID,
         **kwargs
     )
 
@@ -197,7 +224,7 @@ def angle_linux_builder(
     return angle_builder(
         name = name,
         goma_backend = goma_backend,
-        os = builders.os.LINUX_BIONIC,
+        os = builders.os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
         pool = "luci.chromium.gpu.ci",
         **kwargs
     )
@@ -259,6 +286,7 @@ def chromium_builder(*, name, tree_closing = True, **kwargs):
         name = name,
         builder_group = "chromium",
         goma_backend = builders.goma.backend.RBE_PROD,
+        sheriff_rotations = builders.sheriff_rotations.CHROMIUM,
         tree_closing = tree_closing,
         **kwargs
     )
@@ -269,6 +297,7 @@ def chromiumos_builder(*, name, tree_closing = True, **kwargs):
         name = name,
         builder_group = "chromium.chromiumos",
         goma_backend = builders.goma.backend.RBE_PROD,
+        sheriff_rotations = builders.sheriff_rotations.CHROMIUM,
         tree_closing = tree_closing,
         **kwargs
     )
@@ -288,6 +317,7 @@ def clang_builder(*, name, builderless = True, cores = 32, properties = None, **
         # CFI builds will take even longer - around 11h.
         execution_timeout = 14 * time.hour,
         properties = properties,
+        sheriff_rotations = builders.sheriff_rotations.CHROMIUM_CLANG,
         **kwargs
     )
 
@@ -324,7 +354,7 @@ def dawn_linux_builder(
         name = name,
         builderless = True,
         goma_backend = goma_backend,
-        os = builders.os.LINUX_BIONIC,
+        os = builders.os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
         pool = "luci.chromium.gpu.ci",
         **kwargs
     )
@@ -473,6 +503,7 @@ def gpu_fyi_builder(*, name, **kwargs):
         builder_group = "chromium.gpu.fyi",
         service_account =
             "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com",
+        sheriff_rotations = builders.sheriff_rotations.CHROMIUM_GPU,
         properties = {
             "perf_dashboard_machine_group": "ChromiumGPUFYI",
         },
@@ -489,7 +520,7 @@ def gpu_fyi_linux_builder(
         name = name,
         execution_timeout = execution_timeout,
         goma_backend = goma_backend,
-        os = builders.os.LINUX_BIONIC,
+        os = builders.os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
         pool = "luci.chromium.gpu.ci",
         **kwargs
     )
@@ -538,6 +569,7 @@ def gpu_builder(*, name, tree_closing = True, notifies = None, **kwargs):
     return ci.builder(
         name = name,
         builder_group = "chromium.gpu",
+        sheriff_rotations = builders.sheriff_rotations.CHROMIUM_GPU,
         tree_closing = tree_closing,
         notifies = notifies,
         **kwargs
@@ -552,7 +584,7 @@ def gpu_linux_builder(
         name = name,
         builderless = True,
         goma_backend = goma_backend,
-        os = builders.os.LINUX_BIONIC,
+        os = builders.os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
         pool = "luci.chromium.gpu.ci",
         **kwargs
     )
@@ -598,11 +630,13 @@ def linux_builder(
         notifies = ("chromium.linux",),
         extra_notifies = None,
         **kwargs):
+    kwargs.setdefault("os", builders.os.LINUX_BIONIC_REMOVE)
     return ci.builder(
         name = name,
         builder_group = "chromium.linux",
         goma_backend = goma_backend,
         goma_jobs = goma_jobs,
+        sheriff_rotations = builders.sheriff_rotations.CHROMIUM,
         tree_closing = tree_closing,
         notifies = list(notifies) + (extra_notifies or []),
         **kwargs
@@ -614,6 +648,7 @@ def mac_builder(
         cores = None,
         goma_backend = builders.goma.backend.RBE_PROD,
         os = builders.os.MAC_DEFAULT,
+        sheriff_rotations = None,
         tree_closing = True,
         **kwargs):
     return ci.builder(
@@ -622,6 +657,7 @@ def mac_builder(
         cores = cores,
         goma_backend = goma_backend,
         os = os,
+        sheriff_rotations = listify(builders.sheriff_rotations.CHROMIUM, sheriff_rotations),
         tree_closing = tree_closing,
         **kwargs
     )
@@ -639,15 +675,30 @@ def mac_ios_builder(
         goma_backend = goma_backend,
         executable = executable,
         os = os,
+        sheriff_rotations = builders.sheriff_rotations.IOS,
         xcode = xcode,
         **kwargs
     )
 
+def mac_thin_tester(
+        *,
+        name,
+        triggered_by,
+        **kwargs):
+    return thin_tester(
+        name = name,
+        builder_group = "chromium.mac",
+        sheriff_rotations = builders.sheriff_rotations.CHROMIUM,
+        triggered_by = triggered_by,
+        **kwargs
+    )
+
 def memory_builder(
         *,
         name,
         goma_jobs = builders.goma.jobs.MANY_JOBS_FOR_CI,
         notifies = None,
+        sheriff_rotations = None,
         tree_closing = True,
         **kwargs):
     if name.startswith("Linux"):
@@ -660,6 +711,7 @@ def memory_builder(
         goma_backend = builders.goma.backend.RBE_PROD,
         goma_jobs = goma_jobs,
         notifies = notifies,
+        sheriff_rotations = listify(builders.sheriff_rotations.CHROMIUM, sheriff_rotations),
         tree_closing = tree_closing,
         **kwargs
     )
@@ -686,6 +738,7 @@ def swangle_builder(*, name, builderless = True, pinned = True, **kwargs):
         builderless = builderless,
         service_account =
             "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com",
+        sheriff_rotations = builders.sheriff_rotations.CHROMIUM_GPU,
     )
     if pinned:
         builder_args.update(executable = "recipe:angle_chromium")
@@ -698,7 +751,7 @@ def swangle_linux_builder(
     return swangle_builder(
         name = name,
         goma_backend = builders.goma.backend.RBE_PROD,
-        os = builders.os.LINUX_BIONIC,
+        os = builders.os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
         pool = "luci.chromium.gpu.ci",
         **kwargs
     )
@@ -747,6 +800,7 @@ def updater_builder(
         *,
         name,
         **kwargs):
+    kwargs.setdefault("os", os.LINUX_BIONIC_REMOVE)
     return ci.builder(
         name = name,
         builder_group = "chromium.updater",
@@ -765,6 +819,7 @@ def win_builder(
         builder_group = "chromium.win",
         goma_backend = builders.goma.backend.RBE_PROD,
         os = os,
+        sheriff_rotations = builders.sheriff_rotations.CHROMIUM,
         tree_closing = tree_closing,
         **kwargs
     )
@@ -812,6 +867,7 @@ ci = struct(
     linux_builder = linux_builder,
     mac_builder = mac_builder,
     mac_ios_builder = mac_ios_builder,
+    mac_thin_tester = mac_thin_tester,
     memory_builder = memory_builder,
     mojo_builder = mojo_builder,
     swangle_linux_builder = swangle_linux_builder,
diff --git a/chromium/infra/config/lib/listify.star b/chromium/infra/config/lib/listify.star
new file mode 100644
index 00000000000..6afcd92dd5b
--- /dev/null
+++ b/chromium/infra/config/lib/listify.star
@@ -0,0 +1,20 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+def listify(*args):
+    """Create a single list from multiple arguments.
+
+    Each argument can be either a single element or a list of elements. A single
+    element will appear as an element in the resulting list iff it is non-None.
+    A list of elements will have all non-None elements appear in the resulting
+    list.
+    """
+    l = []
+    for a in args:
+        if type(a) != type([]):
+            a = [a]
+        for e in a:
+            if e != None:
+                l.append(e)
+    return l
diff --git a/chromium/infra/config/lib/try.star b/chromium/infra/config/lib/try.star
index 72c46adc6c6..3e8c605746d 100644
--- a/chromium/infra/config/lib/try.star
+++ b/chromium/infra/config/lib/try.star
@@ -19,7 +19,7 @@ to set the default value. Can also be accessed through `try_.defaults`.
 
 load("./args.star", "args")
 load("./branches.star", "branches")
-load("./builders.star", "builders", "os")
+load("./builders.star", "builders", "os", "os_category")
 
 DEFAULT_EXCLUDE_REGEXPS = [
     # Contains documentation that doesn't affect the outputs
@@ -107,8 +107,8 @@ def try_builder(
         specifying additional parameters for exporting test results to BigQuery.
         Will always upload to the following tables in addition to any tables
         specified by the list's elements:
-          luci-resultdb.chromium.try_test_results
-          luci-resultdb.chromium.gpu_try_test_results
+          chrome-luci-data.chromium.try_test_results
+          chrome-luci-data.gpu_try_test_results
     """
     if not branches.matches(branch_selector):
         return
@@ -119,15 +119,23 @@ def try_builder(
     experiments.setdefault("chromium.resultdb.result_sink.junit_tests", 100)
 
     merged_resultdb_bigquery_exports = [
+        # TODO(crbug.com/1230801): Remove when all usages of this table have
+        # been migrated to `chrome-luci-data.chromium.try_test_results`.
         resultdb.export_test_results(
             bq_table = "luci-resultdb.chromium.try_test_results",
         ),
         resultdb.export_test_results(
-            bq_table = "luci-resultdb.chromium.gpu_try_test_results",
+            bq_table = "chrome-luci-data.chromium.try_test_results",
+        ),
+        resultdb.export_test_results(
+            bq_table = "chrome-luci-data.chromium.gpu_try_test_results",
             predicate = resultdb.test_result_predicate(
                 # Only match the telemetry_gpu_integration_test and
                 # fuchsia_telemetry_gpu_integration_test targets.
-                test_id_regexp = "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+",
+                # Android Telemetry targets also have a suffix added to the end
+                # denoting the binary that's included, so also catch those with
+                # [^/]*.
+                test_id_regexp = "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+",
             ),
         ),
     ]
@@ -151,6 +159,15 @@ def try_builder(
     if subproject_list_view:
         list_view.append(subproject_list_view)
 
+    # in CQ/try, disable ATS on windows. http://b/183895446
+    goma_enable_ats = defaults.get_value_from_kwargs("goma_enable_ats", kwargs)
+    os = defaults.get_value_from_kwargs("os", kwargs)
+    if os and os.category == os_category.WINDOWS:
+        if goma_enable_ats == args.COMPUTE:
+            kwargs["goma_enable_ats"] = False
+        if kwargs["goma_enable_ats"] != False:
+            fail("Try Windows builder {} must disable ATS".format(name))
+
     # Define the builder first so that any validation of luci.builder arguments
     # (e.g. bucket) occurs before we try to use it
     builders.builder(
@@ -185,6 +202,7 @@ def try_builder(
         )
 
 def blink_builder(*, name, goma_backend = None, **kwargs):
+    kwargs.setdefault("os", builders.os.LINUX_BIONIC_REMOVE)
     return try_builder(
         name = name,
         builder_group = "tryserver.blink",
@@ -266,7 +284,7 @@ def chromium_angle_ios_builder(*, name, **kwargs):
     )
 
 def chromium_chromiumos_builder(*, name, **kwargs):
-    kwargs.setdefault("os", os.LINUX_BIONIC_REMOVE)
+    kwargs.setdefault("os", builders.os.LINUX_BIONIC_REMOVE)
     return try_builder(
         name = name,
         builder_group = "tryserver.chromium.chromiumos",
@@ -286,6 +304,7 @@ def chromium_dawn_builder(*, name, **kwargs):
     )
 
 def chromium_linux_builder(*, name, goma_backend = builders.goma.backend.RBE_PROD, **kwargs):
+    kwargs.setdefault("os", builders.os.LINUX_BIONIC_REMOVE)
     return try_builder(
         name = name,
         builder_group = "tryserver.chromium.linux",
diff --git a/chromium/infra/config/main.star b/chromium/infra/config/main.star
index 5fc71f61843..17f37ad41c3 100755
--- a/chromium/infra/config/main.star
+++ b/chromium/infra/config/main.star
@@ -10,7 +10,7 @@ load("//lib/branches.star", "branches")
 load("//project.star", "settings")
 
 lucicfg.check_version(
-    min = "1.22.1",
+    min = "1.27.0",
     message = "Update depot_tools",
 )
 
@@ -139,6 +139,7 @@ luci.realm(
 
 # Launch Swarming tasks in "realms-aware mode", crbug.com/1136313.
 luci.builder.defaults.experiments.set({"luci.use_realms": 100})
+luci.builder.defaults.test_presentation.set(resultdb.test_presentation(grouping_keys = ["status", "v.test_suite"]))
 
 exec("//swarming.star")
 
@@ -150,6 +151,7 @@ exec("//subprojects/chromium/subproject.star")
 branches.exec("//subprojects/codesearch/subproject.star")
 branches.exec("//subprojects/findit/subproject.star")
 branches.exec("//subprojects/goma/subproject.star")
+branches.exec("//subprojects/reclient/subproject.star")
 branches.exec("//subprojects/webrtc/subproject.star")
 
 branches.exec("//generators/cq-builders-md.star")
diff --git a/chromium/infra/config/milestones.json b/chromium/infra/config/milestones.json
index 86b10207a28..290d4da9430 100644
--- a/chromium/infra/config/milestones.json
+++ b/chromium/infra/config/milestones.json
@@ -9,14 +9,19 @@
         "project": "chromium-m88",
         "ref": "refs/branch-heads/4324"
     },
-    "89": {
-        "name": "m89",
-        "project": "chromium-m89",
-        "ref": "refs/branch-heads/4389"
-    },
     "90": {
         "name": "m90",
         "project": "chromium-m90",
         "ref": "refs/branch-heads/4430"
+    },
+    "90-lts": {
+        "name": "m90-lts",
+        "project": "chromium-m90-lts",
+        "ref": "refs/branch-heads/4430_101"
+    },
+    "91": {
+        "name": "m91",
+        "project": "chromium-m91",
+        "ref": "refs/branch-heads/4472"
     }
 }
diff --git a/chromium/infra/config/notifiers.star b/chromium/infra/config/notifiers.star
index e8325ec0734..4afe7f759c5 100644
--- a/chromium/infra/config/notifiers.star
+++ b/chromium/infra/config/notifiers.star
@@ -29,6 +29,15 @@ luci.notifier(
 )
 
 luci.notifier(
+    name = "chromium-3pp-packager",
+    on_new_status = ["FAILURE"],
+    notify_emails = [
+        "chromium-3pp-packager+failures@google.com",
+        "clank-build-core+3ppfailures@google.com",
+    ],
+)
+
+luci.notifier(
     name = "cr-fuchsia",
     on_status_change = True,
     notify_emails = [
@@ -41,7 +50,7 @@ luci.notifier(
     name = "cronet",
     on_status_change = True,
     notify_emails = [
-        "cronet-bots-observer@google.com",
+        "cronet-sheriff@grotations.appspotmail.com",
     ],
 )
 
@@ -126,7 +135,7 @@ tree_closure_notifier(
     name = "gpu-tree-closer-email",
     notify_emails = ["chrome-gpu-build-failures@google.com"],
     notify_rotation_urls = [
-        "https://chrome-ops-rotation-proxy.appspot.com/current/grotation:chrome-gpu-pixel-wrangling",
+        "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-gpu-pixel-wrangler",
     ],
 )
 
diff --git a/chromium/infra/config/settings.json b/chromium/infra/config/settings.json
index 25c36df858b..5e45819f33e 100644
--- a/chromium/infra/config/settings.json
+++ b/chromium/infra/config/settings.json
@@ -1,8 +1,8 @@
 {
-    "project": "chromium-m91",
-    "project_title": "Chromium M91",
+    "project": "chromium-m92",
+    "project_title": "Chromium M92",
     "is_main": false,
     "is_lts_branch": false,
-    "ref": "refs/branch-heads/4472",
-    "chrome_project": "chrome-m91"
+    "ref": "refs/branch-heads/4515",
+    "chrome_project": "chrome-m92"
 }
diff --git a/chromium/infra/config/subprojects/README.md b/chromium/infra/config/subprojects/README.md
index 3b9fbfa051d..d70575a288c 100644
--- a/chromium/infra/config/subprojects/README.md
+++ b/chromium/infra/config/subprojects/README.md
@@ -6,6 +6,7 @@ The following subprojects exist:
 * codesearch - Builders that test codesearch with chromium.
 * findit - Builders that are used by the Sheriff-o-Matic findit service.
 * goma - Builders that test the use of goma by chromium builders.
+* reclient - Builders that test the use of reclient by chromium builders.
 * webrtc - Builders that test the integration of WebRTC with chromium.
 
 Each subproject contains a subproject.star that is the entry point for its
diff --git a/chromium/infra/config/subprojects/chromium/ci.star b/chromium/infra/config/subprojects/chromium/ci.star
index d72f35d4d64..fbe49f18b93 100644
--- a/chromium/infra/config/subprojects/chromium/ci.star
+++ b/chromium/infra/config/subprojects/chromium/ci.star
@@ -3,14 +3,14 @@
 # found in the LICENSE file.
 
 load("//lib/branches.star", "branches")
-load("//lib/builders.star", "cpu", "goma", "os", "xcode")
+load("//lib/builders.star", "cpu", "goma", "os", "sheriff_rotations", "xcode")
 load("//lib/ci.star", "ci")
 load("//lib/consoles.star", "consoles")
 load("//console-header.star", "HEADER")
 load("//project.star", "settings")
 
 def main_console_if_on_branch():
-    return branches.value(for_branches = "main")
+    return "main" if not settings.is_main else None
 
 ci.defaults.set(
     bucket = "ci",
@@ -22,7 +22,7 @@ ci.defaults.set(
     execution_timeout = 3 * time.hour,
     os = os.LINUX_DEFAULT,
     pool = "luci.chromium.ci",
-    project_trigger_overrides = branches.value(for_branches = {"chromium": settings.project}),
+    project_trigger_overrides = {"chromium": settings.project} if not settings.is_main else None,
     service_account = "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
     swarming_tags = ["vpython:native-python-wrapper"],
     triggered_by = ["chromium-gitiles-trigger"],
@@ -44,6 +44,11 @@ luci.bucket(
         ),
         acl.entry(
             roles = acl.BUILDBUCKET_TRIGGERER,
+            users = [
+                # Allow chrome-release/branch builders on luci.chrome.official.infra
+                # to schedule builds
+                "chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com",
+            ],
             groups = "project-chromium-ci-schedulers",
         ),
         acl.entry(
@@ -134,13 +139,12 @@ consoles.console_view(
 consoles.console_view(
     name = "chromium.angle",
     ordering = {
-        None: ["Android", "AndroidVk", "Fuchsia", "Linux", "LinuxOzone", "Mac", "iOS", "Windows", "Perf"],
+        None: ["Android", "AndroidVk", "Fuchsia", "Linux", "Mac", "iOS", "Windows", "Perf"],
         "*builder*": ["Builder"],
         "Android": "*builder*",
         "AndroidVk": "*builder*",
         "Fuchsia": "*builder*",
         "Linux": "*builder*",
-        "LinuxOzone": "*builder*",
         "Mac": "*builder*",
         "iOS": "*builder*",
         "Windows": "*builder*",
@@ -223,6 +227,7 @@ consoles.console_view(
             "win10",
             "win32",
             "paeverywhere",
+            "backuprefptr",
         ],
         "code_coverage": consoles.ordering(
             short_names = ["and", "ann", "lnx", "lcr", "jcr", "mac"],
@@ -395,6 +400,17 @@ consoles.console_view(
     },
 )
 
+consoles.console_view(
+    name = "sheriff.fuchsia",
+    title = "Fuchsia Sheriff Console",
+    ordering = {
+        "*type*": consoles.ordering(short_names = ["a64", "x64"]),
+        None: ["ci", "fyi", "misc"],
+        "chromium.mac": "*type*",
+        "chromium.fyi|13": "*type*",
+    },
+)
+
 # The chromium.clang console includes some entries for builders from the chrome project
 [branches.console_view_entry(
     builder = "chrome:ci/{}".format(name),
@@ -419,6 +435,7 @@ consoles.console_view(
     short_name = short_name,
 ) for name, short_name in (
     ("lacros-amd64-generic-chrome", "lcr"),
+    ("lacros-arm-generic-chrome", "lcr"),
     ("linux-chromeos-chrome", "cro"),
     ("linux-chrome", "lnx"),
     ("mac-chrome", "mac"),
@@ -523,6 +540,7 @@ ci.android_builder(
     execution_timeout = 4 * time.hour,
     main_console_view = main_console_if_on_branch(),
     tree_closing = True,
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.android_builder(
@@ -577,6 +595,7 @@ ci.android_builder(
     cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     tree_closing = True,
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.android_builder(
@@ -708,6 +727,7 @@ ci.android_builder(
         category = "builder|other",
         short_name = "size",
     ),
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.android_builder(
@@ -732,6 +752,7 @@ ci.android_builder(
     cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     notifies = ["cronet"],
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.android_builder(
@@ -845,6 +866,7 @@ ci.android_builder(
     cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     tree_closing = True,
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.android_builder(
@@ -855,12 +877,10 @@ ci.android_builder(
         short_name = "M",
     ),
     cq_mirrors_console_view = "mirrors",
-    execution_timeout = branches.value(
-        for_main = 3 * time.hour,
-        for_branches = 4 * time.hour,
-    ),
+    execution_timeout = 3 * time.hour if settings.is_main else 4 * time.hour,
     main_console_view = main_console_if_on_branch(),
     tree_closing = True,
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.android_builder(
@@ -931,6 +951,17 @@ ci.android_builder(
 )
 
 ci.android_builder(
+    name = "android-weblayer-marshmallow-x86-rel-tests",
+    console_view_entry = consoles.console_view_entry(
+        category = "tester|weblayer",
+        short_name = "M",
+    ),
+    triggered_by = ["android-weblayer-with-aosp-webview-x86-rel"],
+    notifies = ["weblayer-sheriff"],
+    os = os.LINUX_BIONIC_REMOVE,
+)
+
+ci.android_builder(
     name = "android-weblayer-oreo-x86-rel-tests",
     console_view_entry = consoles.console_view_entry(
         category = "tester|weblayer",
@@ -953,6 +984,14 @@ ci.android_builder(
 )
 
 ci.android_builder(
+    name = "android-weblayer-with-aosp-webview-x86-rel",
+    console_view_entry = consoles.console_view_entry(
+        category = "builder|weblayer_with_aosp_webview",
+        short_name = "x86",
+    ),
+)
+
+ci.android_builder(
     name = "android-weblayer-x86-rel",
     console_view_entry = consoles.console_view_entry(
         category = "builder|weblayer",
@@ -967,13 +1006,14 @@ ci.android_fyi_builder(
         short_name = "64",
     ),
     cq_mirrors_console_view = "mirrors",
-    goma_jobs = goma.jobs.MANY_JOBS_FOR_CI,
+    reclient_jobs = 150,
     execution_timeout = 5 * time.hour,
     main_console_view = main_console_if_on_branch(),
     reclient_instance = "rbe-chromium-trusted",
     configure_kitchen = True,
     kitchen_emulate_gce = True,
-    os = os.LINUX_DEFAULT,
+    os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
+    schedule = "triggered",  # triggered manually via Scheduler UI
 )
 
 ci.android_fyi_builder(
@@ -986,9 +1026,11 @@ ci.android_fyi_builder(
     # build.
     execution_timeout = 4 * time.hour,
     reclient_instance = "rbe-chromium-trusted",
+    reclient_jobs = 150,
     configure_kitchen = True,
     kitchen_emulate_gce = True,
-    os = os.LINUX_DEFAULT,
+    os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
+    schedule = "triggered",  # triggered manually via Scheduler UI
 )
 
 ci.android_fyi_builder(
@@ -1017,34 +1059,42 @@ ci.android_fyi_builder(
     os = os.LINUX_BIONIC_REMOVE,
 )
 
-ci.android_builder(
-    name = "android-pie-x86-rel",
+ci.android_fyi_builder(
+    name = "android-weblayer-pie-x86-wpt-smoketest",
     console_view_entry = consoles.console_view_entry(
-        category = "builder_tester|x86",
+        category = "builder_tester|weblayer",
         short_name = "P",
     ),
     os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.android_fyi_builder(
-    name = "android-weblayer-10-x86-rel-tests",
+    name = "android-webview-pie-x86-wpt-fyi-rel",
     console_view_entry = consoles.console_view_entry(
-        category = "tester|weblayer",
-        short_name = "10",
+        category = "builder_tester|webview",
+        short_name = "P",
+    ),
+    os = os.LINUX_BIONIC_REMOVE,
+)
+
+ci.android_builder(
+    name = "android-pie-x86-rel",
+    console_view_entry = consoles.console_view_entry(
+        category = "builder_tester|x86",
+        short_name = "P",
     ),
-    triggered_by = ["android-weblayer-with-aosp-webview-x86-fyi-rel"],
-    notifies = ["weblayer-sheriff"],
     os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.android_fyi_builder(
-    name = "android-weblayer-marshmallow-x86-rel-tests",
+    name = "android-weblayer-10-x86-rel-tests",
     console_view_entry = consoles.console_view_entry(
         category = "tester|weblayer",
-        short_name = "M",
+        short_name = "10",
     ),
     triggered_by = ["android-weblayer-with-aosp-webview-x86-fyi-rel"],
     notifies = ["weblayer-sheriff"],
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.android_fyi_builder(
@@ -1211,23 +1261,6 @@ ci.angle_thin_tester(
     triggered_by = ["linux-angle-chromium-builder"],
 )
 
-ci.angle_linux_builder(
-    name = "linux-ozone-angle-builder",
-    console_view_entry = consoles.console_view_entry(
-        category = "LinuxOzone|Builder|ANGLE",
-        short_name = "x64",
-    ),
-)
-
-ci.angle_thin_tester(
-    name = "linux-ozone-angle-intel",
-    console_view_entry = consoles.console_view_entry(
-        category = "LinuxOzone|Intel|ANGLE",
-        short_name = "x64",
-    ),
-    triggered_by = ["linux-ozone-angle-builder"],
-)
-
 ci.angle_mac_builder(
     name = "mac-angle-builder",
     console_view_entry = consoles.console_view_entry(
@@ -1428,6 +1461,7 @@ ci.chromium_builder(
     ),
     cores = 8,
     main_console_view = "main",
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.chromium_builder(
@@ -1438,6 +1472,7 @@ ci.chromium_builder(
     ),
     cores = 32,
     main_console_view = "main",
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.chromium_builder(
@@ -1462,10 +1497,18 @@ ci.chromium_builder(
     name = "fuchsia-official",
     branch_selector = branches.STANDARD_MILESTONE,
     main_console_view = "main",
-    console_view_entry = consoles.console_view_entry(
-        category = "fuchsia",
-        short_name = "off",
-    ),
+    console_view_entry = [
+        consoles.console_view_entry(
+            category = "fuchsia",
+            short_name = "off",
+        ),
+        consoles.console_view_entry(
+            branch_selector = branches.MAIN,
+            console_view = "sheriff.fuchsia",
+            category = "ci",
+            short_name = "off-x64",
+        ),
+    ],
     cores = 32,
     # TODO: Change this back down to something reasonable once these builders
     # have populated their cached by getting through the compile step
@@ -1483,6 +1526,7 @@ ci.chromium_builder(
     # Bump to 32 if needed.
     cores = 8,
     main_console_view = "main",
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.chromium_builder(
@@ -1494,6 +1538,7 @@ ci.chromium_builder(
     cores = 32,
     main_console_view = "main",
     notifies = ["linux-archive-rel"],
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.chromium_builder(
@@ -1539,6 +1584,28 @@ ci.chromium_builder(
 )
 
 ci.chromium_builder(
+    name = "mac-arm64-archive-dbg",
+    console_view_entry = consoles.console_view_entry(
+        category = "mac|arm",
+        short_name = "dbg",
+    ),
+    cores = 12,
+    main_console_view = "main",
+    os = os.MAC_DEFAULT,
+)
+
+ci.chromium_builder(
+    name = "mac-arm64-archive-rel",
+    console_view_entry = consoles.console_view_entry(
+        category = "mac|arm",
+        short_name = "rel",
+    ),
+    main_console_view = "main",
+    cores = 12,
+    os = os.MAC_DEFAULT,
+)
+
+ci.chromium_builder(
     name = "mac-official",
     builderless = False,
     # TODO(https://crbug.com/1072012) Use the default console view and add
@@ -1642,6 +1709,27 @@ ci.chromiumos_builder(
     ),
     tree_closing = False,
     main_console_view = "main",
+    triggered_by = [],
+    schedule = "triggered",
+    properties = {
+        # The format of these properties is defined at archive/properties.proto
+        "$build/archive": {
+            "cipd_archive_datas": [
+                {
+                    "yaml_files": [
+                        "gen_linux_ash_chromium_cipd_yaml_cipd.yaml",
+                    ],
+                    "refs": [
+                        "{%channel%}",
+                    ],
+                    "tags": {
+                        "version": "{%chromium_version%}",
+                    },
+                    "only_set_refs_on_tests_success": True,
+                },
+            ],
+        },
+    },
 )
 
 ci.chromiumos_builder(
@@ -1700,6 +1788,7 @@ ci.chromiumos_builder(
         category = "simple|release|x64",
         short_name = "rel",
     ),
+    os = os.LINUX_BIONIC_REMOVE,
     cq_mirrors_console_view = "mirrors",
     main_console_view = "main",
 )
@@ -1720,6 +1809,7 @@ ci.chromiumos_builder(
         category = "simple|release",
         short_name = "arm",
     ),
+    os = os.LINUX_BIONIC_REMOVE,
     cq_mirrors_console_view = "mirrors",
     main_console_view = "main",
 )
@@ -1777,6 +1867,19 @@ ci.chromiumos_builder(
     ),
     cq_mirrors_console_view = "mirrors",
     main_console_view = "main",
+    os = os.LINUX_BIONIC_REMOVE,
+)
+
+ci.chromiumos_builder(
+    name = "lacros-arm-generic-rel",
+    console_view_entry = consoles.console_view_entry(
+        category = "lacros|arm",
+        short_name = "arm",
+    ),
+    # TODO(crbug.com/1202631) Enable tree closing when stable.
+    tree_closing = False,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
 )
 
 ci.chromiumos_builder(
@@ -1799,6 +1902,7 @@ ci.chromiumos_builder(
     ),
     cq_mirrors_console_view = "mirrors",
     main_console_view = "main",
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.chromiumos_builder(
@@ -1810,6 +1914,7 @@ ci.chromiumos_builder(
     ),
     cq_mirrors_console_view = "mirrors",
     main_console_view = "main",
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.chromiumos_builder(
@@ -1823,6 +1928,7 @@ ci.chromiumos_builder(
     cq_mirrors_console_view = "mirrors",
     triggered_by = ["linux-lacros-builder-rel"],
     tree_closing = False,
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 # For Chromebox for meetings(CfM)
@@ -1843,10 +1949,26 @@ ci.cipd_3pp_builder(
         category = "3pp|linux",
         short_name = "amd64",
     ),
+    notifies = ["chromium-3pp-packager"],
     schedule = "with 6h interval",
     triggered_by = [],
     properties = {
+        # TODO(hypan): Remove this property after chromium_3pp is
+        # migrated to a recipe module (crrev.com/c/2870555)
         "platform": "linux-amd64",
+        "$build/chromium_3pp": {
+            "platform": "linux-amd64",
+            "preprocess": [{
+                "name": "third_party/android_deps",
+                "cmd": [
+                    "{CHECKOUT}/src/third_party/android_deps/fetch_all.py",
+                    "-v",
+                    "--ignore-vulnerabilities",
+                ],
+            }],
+            "gclient_config": "chromium",
+            "gclient_apply_config": ["android"],
+        },
     },
 )
 
@@ -1858,6 +1980,7 @@ ci.cipd_builder(
     ),
     executable = "recipe:android/androidx_packager",
     schedule = "0 7,14,22 * * * *",
+    sheriff_rotations = sheriff_rotations.ANDROID,
     triggered_by = [],
 )
 
@@ -2048,14 +2171,6 @@ ci.clang_builder(
 )
 
 ci.clang_builder(
-    name = "ToTAndroidCFI",
-    console_view_entry = consoles.console_view_entry(
-        category = "ToT Android",
-        short_name = "cfi",
-    ),
-)
-
-ci.clang_builder(
     name = "ToTAndroidOfficial",
     console_view_entry = consoles.console_view_entry(
         category = "ToT Android",
@@ -2065,18 +2180,34 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTFuchsia x64",
-    console_view_entry = consoles.console_view_entry(
-        category = "ToT Fuchsia",
-        short_name = "x64",
-    ),
+    console_view_entry = [
+        consoles.console_view_entry(
+            category = "ToT Fuchsia",
+            short_name = "x64",
+        ),
+        consoles.console_view_entry(
+            branch_selector = branches.MAIN,
+            console_view = "sheriff.fuchsia",
+            category = "misc",
+            short_name = "clang-x64",
+        ),
+    ],
 )
 
 ci.clang_builder(
     name = "ToTFuchsiaOfficial",
-    console_view_entry = consoles.console_view_entry(
-        category = "ToT Fuchsia",
-        short_name = "off",
-    ),
+    console_view_entry = [
+        consoles.console_view_entry(
+            category = "ToT Fuchsia",
+            short_name = "off",
+        ),
+        consoles.console_view_entry(
+            branch_selector = branches.MAIN,
+            console_view = "sheriff.fuchsia",
+            category = "misc",
+            short_name = "clang-off",
+        ),
+    ],
 )
 
 def clang_tot_linux_builder(short_name, category = "ToT Linux", **kwargs):
@@ -2144,6 +2275,7 @@ clang_tot_linux_builder(
 
 ci.clang_builder(
     name = "ToTWin(dbg)",
+    builderless = False,
     console_view_entry = consoles.console_view_entry(
         category = "ToT Windows",
         short_name = "dbg",
@@ -2180,6 +2312,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTWinASanLibfuzzer",
+    builderless = False,
     console_view_entry = consoles.console_view_entry(
         category = "ToT Windows|Asan",
         short_name = "fuz",
@@ -2920,43 +3053,24 @@ ci.fyi_builder(
     ),
     cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.fyi_builder(
-    name = "android-paeverywhere-arm-fyi-dbg",
-    builderless = True,
-    console_view_entry = consoles.console_view_entry(
-        category = "paeverywhere|android",
-        short_name = "32dbg",
-    ),
-    notifies = ["chrome-memory-safety"],
-)
-
-ci.fyi_builder(
-    name = "android-paeverywhere-arm-fyi-rel",
+    name = "android-backuprefptr-arm-fyi-rel",
     builderless = True,
     console_view_entry = consoles.console_view_entry(
-        category = "paeverywhere|android",
+        category = "backuprefptr|android",
         short_name = "32rel",
     ),
     notifies = ["chrome-memory-safety"],
 )
 
 ci.fyi_builder(
-    name = "android-paeverywhere-arm64-fyi-dbg",
+    name = "android-backuprefptr-arm64-fyi-rel",
     builderless = True,
     console_view_entry = consoles.console_view_entry(
-        category = "paeverywhere|android",
-        short_name = "64dbg",
-    ),
-    notifies = ["chrome-memory-safety"],
-)
-
-ci.fyi_builder(
-    name = "android-paeverywhere-arm64-fyi-rel",
-    builderless = True,
-    console_view_entry = consoles.console_view_entry(
-        category = "paeverywhere|android",
+        category = "backuprefptr|android",
         short_name = "64rel",
     ),
     notifies = ["chrome-memory-safety"],
@@ -2975,38 +3089,73 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "fuchsia-fyi-arm64-dbg",
-    console_view_entry = consoles.console_view_entry(
-        category = "fuchsia|a64",
-        short_name = "dbg",
-    ),
+    console_view_entry = [
+        consoles.console_view_entry(
+            category = "fuchsia|a64",
+            short_name = "dbg",
+        ),
+        consoles.console_view_entry(
+            branch_selector = branches.MAIN,
+            console_view = "sheriff.fuchsia",
+            category = "fyi",
+            short_name = "a64-dbg",
+        ),
+    ],
     notifies = ["cr-fuchsia"],
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.fyi_builder(
     name = "fuchsia-fyi-arm64-rel",
-    console_view_entry = consoles.console_view_entry(
-        category = "fuchsia|a64",
-        short_name = "rel",
-    ),
+    console_view_entry = [
+        consoles.console_view_entry(
+            category = "fuchsia|a64",
+            short_name = "rel",
+        ),
+        consoles.console_view_entry(
+            branch_selector = branches.MAIN,
+            console_view = "sheriff.fuchsia",
+            category = "fyi",
+            short_name = "a64",
+        ),
+    ],
     notifies = ["cr-fuchsia"],
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.fyi_builder(
     name = "fuchsia-fyi-x64-dbg",
-    console_view_entry = consoles.console_view_entry(
-        category = "fuchsia|x64",
-        short_name = "dbg",
-    ),
+    console_view_entry = [
+        consoles.console_view_entry(
+            category = "fuchsia|x64",
+            short_name = "dbg",
+        ),
+        consoles.console_view_entry(
+            branch_selector = branches.MAIN,
+            console_view = "sheriff.fuchsia",
+            category = "fyi",
+            short_name = "x64-dbg",
+        ),
+    ],
     notifies = ["cr-fuchsia"],
 )
 
 ci.fyi_builder(
     name = "fuchsia-fyi-x64-rel",
-    console_view_entry = consoles.console_view_entry(
-        category = "fuchsia|x64",
-        short_name = "rel",
-    ),
+    console_view_entry = [
+        consoles.console_view_entry(
+            category = "fuchsia|x64",
+            short_name = "rel",
+        ),
+        consoles.console_view_entry(
+            branch_selector = branches.MAIN,
+            console_view = "sheriff.fuchsia",
+            category = "fyi",
+            short_name = "x64",
+        ),
+    ],
     notifies = ["cr-fuchsia"],
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.fyi_builder(
@@ -3024,6 +3173,7 @@ ci.fyi_builder(
         short_name = "lnx",
     ),
     notifies = ["annotator-rel"],
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.fyi_builder(
@@ -3065,6 +3215,13 @@ ci.fyi_builder(
 )
 
 ci.fyi_builder(
+    name = "linux-lacros-version-skew-fyi",
+    console_view_entry = consoles.console_view_entry(
+        category = "default",
+    ),
+)
+
+ci.fyi_builder(
     name = "linux-blink-animation-use-time-delta",
     console_view_entry = consoles.console_view_entry(
         category = "linux|blink",
@@ -3078,6 +3235,7 @@ ci.fyi_builder(
         category = "linux|blink",
         short_name = "CM",
     ),
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.fyi_builder(
@@ -3087,6 +3245,7 @@ ci.fyi_builder(
         short_name = "VF",
     ),
     notifies = ["linux-blink-fyi-bots"],
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.fyi_builder(
@@ -3096,6 +3255,7 @@ ci.fyi_builder(
         short_name = "VO",
     ),
     notifies = ["linux-blink-fyi-bots"],
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.fyi_builder(
@@ -3147,21 +3307,10 @@ ci.fyi_builder(
 )
 
 ci.fyi_builder(
-    name = "linux-paeverywhere-x64-fyi-dbg",
+    name = "linux-backuprefptr-x64-fyi-rel",
     builderless = True,
     console_view_entry = consoles.console_view_entry(
-        category = "paeverywhere|linux",
-        short_name = "64dbg",
-    ),
-    notifies = ["chrome-memory-safety"],
-    os = os.LINUX_DEFAULT,
-)
-
-ci.fyi_builder(
-    name = "linux-paeverywhere-x64-fyi-rel",
-    builderless = True,
-    console_view_entry = consoles.console_view_entry(
-        category = "paeverywhere|linux",
+        category = "backuprefptr|linux",
         short_name = "64rel",
     ),
     notifies = ["chrome-memory-safety"],
@@ -3173,6 +3322,7 @@ ci.fyi_builder(
     console_view_entry = consoles.console_view_entry(
         category = "linux",
     ),
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.fyi_builder(
@@ -3182,6 +3332,7 @@ ci.fyi_builder(
     ),
     experimental = True,
     goma_backend = goma.backend.RBE_PROD,
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.fyi_builder(
@@ -3191,6 +3342,7 @@ ci.fyi_builder(
     ),
     experimental = True,
     goma_backend = goma.backend.RBE_PROD,
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.fyi_builder(
@@ -3200,6 +3352,7 @@ ci.fyi_builder(
     ),
     experimental = True,
     goma_backend = goma.backend.RBE_PROD,
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 # This is launching & collecting entirely isolated tests.
@@ -3428,21 +3581,10 @@ ci.updater_builder(
 )
 
 ci.fyi_builder(
-    name = "win-paeverywhere-x86-fyi-dbg",
-    builderless = True,
-    console_view_entry = consoles.console_view_entry(
-        category = "paeverywhere|win",
-        short_name = "32dbg",
-    ),
-    notifies = ["chrome-memory-safety"],
-    os = os.WINDOWS_ANY,
-)
-
-ci.fyi_builder(
-    name = "win-paeverywhere-x86-fyi-rel",
+    name = "win-backuprefptr-x86-fyi-rel",
     builderless = True,
     console_view_entry = consoles.console_view_entry(
-        category = "paeverywhere|win",
+        category = "backuprefptr|win",
         short_name = "32rel",
     ),
     notifies = ["chrome-memory-safety"],
@@ -3450,21 +3592,10 @@ ci.fyi_builder(
 )
 
 ci.fyi_builder(
-    name = "win-paeverywhere-x64-fyi-dbg",
+    name = "win-backuprefptr-x64-fyi-rel",
     builderless = True,
     console_view_entry = consoles.console_view_entry(
-        category = "paeverywhere|win",
-        short_name = "64dbg",
-    ),
-    notifies = ["chrome-memory-safety"],
-    os = os.WINDOWS_ANY,
-)
-
-ci.fyi_builder(
-    name = "win-paeverywhere-x64-fyi-rel",
-    builderless = True,
-    console_view_entry = consoles.console_view_entry(
-        category = "paeverywhere|win",
+        category = "backuprefptr|win",
         short_name = "64rel",
     ),
     notifies = ["chrome-memory-safety"],
@@ -3531,25 +3662,77 @@ ci.fyi_builder(
 )
 
 ci.fyi_builder(
-    name = "Linux Builder (goma cache silo)",
+    name = "Linux Builder (core-32) (goma)",
     console_view_entry = consoles.console_view_entry(
         category = "linux",
-        short_name = "lgc",
+        short_name = "c32g",
     ),
-    os = os.LINUX_DEFAULT,
+    cores = 32,
+    goma_jobs = 500,
+    configure_kitchen = True,
+    os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
+    schedule = "triggered",
+)
+
+ci.fyi_builder(
+    name = "Linux Builder (core-32) (reclient)",
+    console_view_entry = consoles.console_view_entry(
+        category = "linux",
+        short_name = "c32r",
+    ),
+    cores = 32,
+    goma_backend = None,
+    reclient_instance = "rbe-chromium-trusted",
+    reclient_jobs = 500,
+    configure_kitchen = True,
+    kitchen_emulate_gce = True,
+    os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
+    schedule = "triggered",
+)
+
+ci.fyi_builder(
+    name = "Linux Builder (core-32) (runsc) (reclient)",
+    console_view_entry = consoles.console_view_entry(
+        category = "linux",
+        short_name = "c32rg",
+    ),
+    cores = 32,
+    goma_backend = None,
+    reclient_instance = "rbe-chromium-gvisor-shadow",
+    reclient_jobs = 500,
+    configure_kitchen = True,
+    kitchen_emulate_gce = True,
+    os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
+    schedule = "triggered",
 )
 
 ci.fyi_builder(
-    name = "Linux Builder (reclient)",
+    name = "Linux Builder (deps-cache) (reclient)",
     console_view_entry = consoles.console_view_entry(
         category = "linux",
         short_name = "re",
     ),
     goma_backend = None,
-    reclient_instance = "goma-rbe-chromium",
+    reclient_instance = "rbe-chromium-trusted",
+    reclient_jobs = 500,
+    configure_kitchen = True,
+    kitchen_emulate_gce = True,
+    os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
+)
+
+ci.fyi_builder(
+    name = "Linux Builder (j-500) (reclient)",
+    console_view_entry = consoles.console_view_entry(
+        category = "linux",
+        short_name = "re",
+    ),
+    goma_backend = None,
+    reclient_instance = "rbe-chromium-trusted",
+    reclient_jobs = 500,
     configure_kitchen = True,
     kitchen_emulate_gce = True,
     os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
+    schedule = "triggered",
 )
 
 ci.fyi_builder(
@@ -3573,7 +3756,7 @@ ci.fyi_builder(
         short_name = "dre",
     ),
     triggering_policy = scheduler.greedy_batching(
-        max_concurrent_invocations = 4,
+        max_concurrent_invocations = 1,
     ),
     goma_backend = None,
     reclient_instance = "goma-rbe-chromium",
@@ -3584,7 +3767,38 @@ ci.fyi_builder(
 )
 
 ci.fyi_builder(
-    name = "TSAN Release (j-100) (reclient)",
+    name = "TSAN Release (core-32) (goma)",
+    console_view_entry = consoles.console_view_entry(
+        category = "linux tsan",
+        short_name = "rre",
+    ),
+    cores = 32,
+    goma_jobs = 250,
+    configure_kitchen = True,
+    kitchen_emulate_gce = True,
+    os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
+    schedule = "triggered",  # triggered manually via Scheduler UI
+)
+
+ci.fyi_builder(
+    name = "TSAN Release (core-32) (reclient)",
+    console_view_entry = consoles.console_view_entry(
+        category = "linux tsan",
+        short_name = "rre",
+    ),
+    cores = 32,
+    goma_backend = None,
+    reclient_instance = "rbe-chromium-trusted",
+    reclient_jobs = 250,
+    reclient_rewrapper_env = {"RBE_cache_silo": "TSAN Release (core-32) (reclient)"},
+    configure_kitchen = True,
+    kitchen_emulate_gce = True,
+    os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
+    schedule = "triggered",  # triggered manually via Scheduler UI
+)
+
+ci.fyi_builder(
+    name = "TSAN Release (deps-cache) (reclient)",
     console_view_entry = consoles.console_view_entry(
         category = "linux tsan",
         short_name = "rre",
@@ -3594,15 +3808,14 @@ ci.fyi_builder(
     ),
     goma_backend = None,
     reclient_instance = "rbe-chromium-trusted",
-    reclient_jobs = 100,
-    reclient_rewrapper_env = {"RBE_cache_silo": "Linux TSan Builder (reclient)"},
+    reclient_rewrapper_env = {"RBE_cache_silo": "TSAN Release (deps-cache) (reclient)"},
     configure_kitchen = True,
     kitchen_emulate_gce = True,
     os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
 )
 
 ci.fyi_builder(
-    name = "TSAN Release (j-250) (reclient)",
+    name = "TSAN Release (deps-cache-full-files) (reclient)",
     console_view_entry = consoles.console_view_entry(
         category = "linux tsan",
         short_name = "rre",
@@ -3612,11 +3825,26 @@ ci.fyi_builder(
     ),
     goma_backend = None,
     reclient_instance = "rbe-chromium-trusted",
+    reclient_rewrapper_env = {"RBE_cache_silo": "TSAN Release (deps-cache-full-files) (reclient)"},
+    configure_kitchen = True,
+    kitchen_emulate_gce = True,
+    os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
+)
+
+ci.fyi_builder(
+    name = "TSAN Release (j-250) (reclient)",
+    console_view_entry = consoles.console_view_entry(
+        category = "linux tsan",
+        short_name = "rre",
+    ),
+    goma_backend = None,
+    reclient_instance = "rbe-chromium-trusted",
     reclient_jobs = 250,
     reclient_rewrapper_env = {"RBE_cache_silo": "Linux TSan Builder (reclient)"},
     configure_kitchen = True,
     kitchen_emulate_gce = True,
-    os = os.LINUX_DEFAULT,
+    os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
+    schedule = "triggered",  # triggered manually via Scheduler UI
 )
 
 ci.fyi_builder(
@@ -3626,7 +3854,7 @@ ci.fyi_builder(
         short_name = "rre",
     ),
     triggering_policy = scheduler.greedy_batching(
-        max_concurrent_invocations = 3,
+        max_concurrent_invocations = 1,
     ),
     goma_backend = None,
     reclient_instance = "goma-rbe-chromium",
@@ -3643,7 +3871,7 @@ ci.fyi_builder(
         short_name = "rre",
     ),
     triggering_policy = scheduler.greedy_batching(
-        max_concurrent_invocations = 3,
+        max_concurrent_invocations = 1,
     ),
     goma_backend = None,
     reclient_instance = "rbe-chromium-gvisor-shadow",
@@ -3659,7 +3887,7 @@ ci.fyi_builder(
         short_name = "dbg",
     ),
     triggering_policy = scheduler.greedy_batching(
-        max_concurrent_invocations = 4,
+        max_concurrent_invocations = 1,
     ),
     goma_backend = None,
     reclient_instance = "goma-rbe-chromium",
@@ -3675,7 +3903,7 @@ ci.fyi_builder(
         short_name = "rel",
     ),
     triggering_policy = scheduler.greedy_batching(
-        max_concurrent_invocations = 4,
+        max_concurrent_invocations = 1,
     ),
     goma_backend = None,
     reclient_instance = "goma-rbe-chromium",
@@ -3752,10 +3980,18 @@ ci.fyi_coverage_builder(
 
 ci.fyi_coverage_builder(
     name = "fuchsia-code-coverage",
-    console_view_entry = consoles.console_view_entry(
-        category = "code_coverage",
-        short_name = "fsa",
-    ),
+    console_view_entry = [
+        consoles.console_view_entry(
+            category = "code_coverage",
+            short_name = "fsa",
+        ),
+        consoles.console_view_entry(
+            branch_selector = branches.MAIN,
+            console_view = "sheriff.fuchsia",
+            category = "misc",
+            short_name = "cov",
+        ),
+    ],
     use_clang_coverage = True,
     schedule = "triggered",
     triggered_by = [],
@@ -3810,6 +4046,16 @@ ci.fyi_coverage_builder(
 )
 
 ci.fyi_coverage_builder(
+    name = "linux-lacros-code-coverage",
+    console_view_entry = consoles.console_view_entry(
+        category = "code_coverage",
+        short_name = "lac",
+    ),
+    use_clang_coverage = True,
+    coverage_test_types = ["overall", "unit"],
+)
+
+ci.fyi_coverage_builder(
     name = "mac-code-coverage",
     builderless = True,
     console_view_entry = consoles.console_view_entry(
@@ -3930,6 +4176,7 @@ ci.fyi_ios_builder(
         category = "iOS|iOS14",
         short_name = "ios14",
     ),
+    os = os.MAC_11,
 )
 
 ci.fyi_ios_builder(
@@ -3938,7 +4185,8 @@ ci.fyi_ios_builder(
         category = "iOS|iOS14",
         short_name = "sdk14",
     ),
-    xcode = xcode.x12d4e,
+    os = os.MAC_11,
+    xcode = xcode.x12e262,
 )
 
 ci.fyi_mac_builder(
@@ -3984,20 +4232,18 @@ ci.fyi_mac_builder(
 )
 
 ci.fyi_windows_builder(
-    name = "Win10 Tests x64 1803",
+    name = "Win 10 Fast Ring",
     console_view_entry = consoles.console_view_entry(
-        category = "win10|1803",
+        category = "win10",
     ),
-    goma_backend = None,
-    main_console_view = None,
     os = os.WINDOWS_10,
-    triggered_by = ["ci/Win x64 Builder"],
+    notifies = ["Win 10 Fast Ring"],
 )
 
 ci.fyi_windows_builder(
-    name = "Win10 Tests x64 1909",
+    name = "Win10 Tests x64 20h2",
     console_view_entry = consoles.console_view_entry(
-        category = "win10|1909",
+        category = "win10|20h2",
     ),
     goma_backend = None,
     main_console_view = None,
@@ -4006,15 +4252,6 @@ ci.fyi_windows_builder(
 )
 
 ci.fyi_windows_builder(
-    name = "Win 10 Fast Ring",
-    console_view_entry = consoles.console_view_entry(
-        category = "win10",
-    ),
-    os = os.WINDOWS_10,
-    notifies = ["Win 10 Fast Ring"],
-)
-
-ci.fyi_windows_builder(
     name = "win32-arm64-rel",
     console_view_entry = consoles.console_view_entry(
         category = "win32|arm64",
@@ -4340,14 +4577,6 @@ ci.gpu_fyi_linux_builder(
 )
 
 ci.gpu_fyi_linux_builder(
-    name = "GPU FYI Linux Ozone Builder",
-    console_view_entry = consoles.console_view_entry(
-        category = "Linux|Builder",
-        short_name = "ozn",
-    ),
-)
-
-ci.gpu_fyi_linux_builder(
     name = "GPU FYI Linux dEQP Builder",
     console_view_entry = consoles.console_view_entry(
         category = "Linux|Builder",
@@ -4458,15 +4687,6 @@ ci.gpu_fyi_thin_tester(
 )
 
 ci.gpu_fyi_thin_tester(
-    name = "Linux FYI Ozone (Intel)",
-    console_view_entry = consoles.console_view_entry(
-        category = "Linux|Intel",
-        short_name = "ozn",
-    ),
-    triggered_by = ["GPU FYI Linux Ozone Builder"],
-)
-
-ci.gpu_fyi_thin_tester(
     name = "Linux FYI Release (NVIDIA)",
     console_view_entry = consoles.console_view_entry(
         category = "Linux|Nvidia",
@@ -4754,15 +4974,6 @@ ci.gpu_fyi_thin_tester(
 )
 
 ci.gpu_fyi_thin_tester(
-    name = "Win7 FYI Debug (AMD)",
-    console_view_entry = consoles.console_view_entry(
-        category = "Windows|7|x86|AMD",
-        short_name = "dbg",
-    ),
-    triggered_by = ["GPU FYI Win Builder (dbg)"],
-)
-
-ci.gpu_fyi_thin_tester(
     name = "Win7 FYI Release (AMD)",
     console_view_entry = consoles.console_view_entry(
         category = "Windows|7|x86|AMD",
@@ -4798,14 +5009,6 @@ ci.gpu_fyi_windows_builder(
 )
 
 ci.gpu_fyi_windows_builder(
-    name = "GPU FYI Win Builder (dbg)",
-    console_view_entry = consoles.console_view_entry(
-        category = "Windows|Builder|Debug",
-        short_name = "x86",
-    ),
-)
-
-ci.gpu_fyi_windows_builder(
     name = "GPU FYI Win x64 Builder",
     console_view_entry = consoles.console_view_entry(
         category = "Windows|Builder|Release",
@@ -4868,11 +5071,33 @@ ci.linux_builder(
 )
 
 ci.linux_builder(
-    name = "Deterministic Fuchsia (dbg)",
+    name = "Cast Linux Debug",
+    branch_selector = branches.STANDARD_MILESTONE,
     console_view_entry = consoles.console_view_entry(
-        category = "fuchsia|x64",
-        short_name = "det",
+        category = "cast",
+        short_name = "dbg",
     ),
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
+    os = os.LINUX_BIONIC,
+    # TODO(crbug.com/1173333): Make it tree-closing.
+    tree_closing = False,
+)
+
+ci.linux_builder(
+    name = "Deterministic Fuchsia (dbg)",
+    console_view_entry = [
+        consoles.console_view_entry(
+            category = "fuchsia|x64",
+            short_name = "det",
+        ),
+        consoles.console_view_entry(
+            branch_selector = branches.MAIN,
+            console_view = "sheriff.fuchsia",
+            category = "misc",
+            short_name = "det",
+        ),
+    ],
     executable = "recipe:swarming/deterministic_build",
     execution_timeout = 6 * time.hour,
     goma_jobs = None,
@@ -4910,10 +5135,18 @@ ci.linux_builder(
 ci.linux_builder(
     name = "Fuchsia ARM64",
     branch_selector = branches.STANDARD_MILESTONE,
-    console_view_entry = consoles.console_view_entry(
-        category = "fuchsia|a64",
-        short_name = "rel",
-    ),
+    console_view_entry = [
+        consoles.console_view_entry(
+            category = "fuchsia|a64",
+            short_name = "rel",
+        ),
+        consoles.console_view_entry(
+            branch_selector = branches.MAIN,
+            console_view = "sheriff.fuchsia",
+            category = "ci",
+            short_name = "arm64",
+        ),
+    ],
     cq_mirrors_console_view = "mirrors",
     main_console_view = "main",
     extra_notifies = ["cr-fuchsia"],
@@ -4922,10 +5155,18 @@ ci.linux_builder(
 ci.linux_builder(
     name = "Fuchsia x64",
     branch_selector = branches.STANDARD_MILESTONE,
-    console_view_entry = consoles.console_view_entry(
-        category = "fuchsia|x64",
-        short_name = "rel",
-    ),
+    console_view_entry = [
+        consoles.console_view_entry(
+            category = "fuchsia|x64",
+            short_name = "rel",
+        ),
+        consoles.console_view_entry(
+            branch_selector = branches.MAIN,
+            console_view = "sheriff.fuchsia",
+            category = "ci",
+            short_name = "x64",
+        ),
+    ],
     cq_mirrors_console_view = "mirrors",
     main_console_view = "main",
     extra_notifies = ["cr-fuchsia"],
@@ -5005,10 +5246,18 @@ ci.linux_builder(
 ci.linux_builder(
     name = "fuchsia-arm64-cast",
     branch_selector = branches.STANDARD_MILESTONE,
-    console_view_entry = consoles.console_view_entry(
-        category = "fuchsia|cast",
-        short_name = "a64",
-    ),
+    console_view_entry = [
+        consoles.console_view_entry(
+            category = "fuchsia|cast",
+            short_name = "a64",
+        ),
+        consoles.console_view_entry(
+            branch_selector = branches.MAIN,
+            console_view = "sheriff.fuchsia",
+            category = "ci",
+            short_name = "arm64-cast",
+        ),
+    ],
     cq_mirrors_console_view = "mirrors",
     main_console_view = "main",
     # Set tree_closing to false to disable the defaualt tree closer, which
@@ -5030,10 +5279,18 @@ ci.linux_builder(
 ci.linux_builder(
     name = "fuchsia-x64-cast",
     branch_selector = branches.STANDARD_MILESTONE,
-    console_view_entry = consoles.console_view_entry(
-        category = "fuchsia|cast",
-        short_name = "x64",
-    ),
+    console_view_entry = [
+        consoles.console_view_entry(
+            category = "fuchsia|cast",
+            short_name = "x64",
+        ),
+        consoles.console_view_entry(
+            branch_selector = branches.MAIN,
+            console_view = "sheriff.fuchsia",
+            category = "ci",
+            short_name = "x64-cast",
+        ),
+    ],
     cq_mirrors_console_view = "mirrors",
     main_console_view = "main",
     # Set tree_closing to false to disable the defaualt tree closer, which
@@ -5045,10 +5302,18 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "fuchsia-x64-dbg",
-    console_view_entry = consoles.console_view_entry(
-        category = "fuchsia|x64",
-        short_name = "dbg",
-    ),
+    console_view_entry = [
+        consoles.console_view_entry(
+            category = "fuchsia|x64",
+            short_name = "dbg",
+        ),
+        consoles.console_view_entry(
+            branch_selector = branches.MAIN,
+            console_view = "sheriff.fuchsia",
+            category = "ci",
+            short_name = "x64-dbg",
+        ),
+    ],
     main_console_view = "main",
     extra_notifies = ["cr-fuchsia"],
 )
@@ -5179,6 +5444,17 @@ ci.linux_builder(
 )
 
 ci.linux_builder(
+    name = "linux-bionic-rel",
+    console_view_entry = consoles.console_view_entry(
+        category = "release",
+        short_name = "bio",
+    ),
+    main_console_view = "main",
+    os = os.LINUX_BIONIC,
+    tree_closing = False,
+)
+
+ci.linux_builder(
     name = "linux-trusty-rel",
     console_view_entry = consoles.console_view_entry(
         category = "release",
@@ -5189,6 +5465,16 @@ ci.linux_builder(
 )
 
 ci.linux_builder(
+    name = "linux-xenial-rel",
+    console_view_entry = consoles.console_view_entry(
+        category = "release",
+        short_name = "xen",
+    ),
+    main_console_view = "main",
+    os = os.LINUX_XENIAL,
+)
+
+ci.linux_builder(
     name = "metadata-exporter",
     console_view_entry = consoles.console_view_entry(
         console_view = "metadata.exporter",
@@ -5209,10 +5495,6 @@ ci.mac_builder(
     cq_mirrors_console_view = "mirrors",
     main_console_view = "main",
     os = os.MAC_10_15,
-    experiments = {
-        # TODO(crbug.com/1143122): remove this.
-        "chromium.chromium_tests.use_rbe_cas": 20,
-    },
 )
 
 ci.mac_builder(
@@ -5242,9 +5524,8 @@ ci.mac_builder(
 # TODO(estaab) When promoting out of FYI, make tree_closing True and make
 # branch_selector branches.STANDARD_RELEASES, then remove the entry for this
 # builder from //generators/scheduler-noop-jobs.star
-ci.thin_tester(
+ci.mac_thin_tester(
     name = "mac-arm64-rel-tests",
-    builder_group = "chromium.fyi",
     console_view_entry = consoles.console_view_entry(
         category = "mac",
         short_name = "a64",
@@ -5253,10 +5534,9 @@ ci.thin_tester(
     triggered_by = ["ci/mac-arm64-rel"],
 )
 
-ci.thin_tester(
+ci.mac_thin_tester(
     name = "Mac10.11 Tests",
     branch_selector = branches.STANDARD_MILESTONE,
-    builder_group = "chromium.mac",
     console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "11",
@@ -5266,10 +5546,9 @@ ci.thin_tester(
     triggered_by = ["ci/Mac Builder"],
 )
 
-ci.thin_tester(
+ci.mac_thin_tester(
     name = "Mac10.12 Tests",
     branch_selector = branches.STANDARD_MILESTONE,
-    builder_group = "chromium.mac",
     console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "12",
@@ -5279,10 +5558,9 @@ ci.thin_tester(
     triggered_by = ["ci/Mac Builder"],
 )
 
-ci.thin_tester(
+ci.mac_thin_tester(
     name = "Mac10.13 Tests",
     branch_selector = branches.STANDARD_MILESTONE,
-    builder_group = "chromium.mac",
     console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "13",
@@ -5292,10 +5570,9 @@ ci.thin_tester(
     triggered_by = ["ci/Mac Builder"],
 )
 
-ci.thin_tester(
+ci.mac_thin_tester(
     name = "Mac10.14 Tests",
     branch_selector = branches.STANDARD_MILESTONE,
-    builder_group = "chromium.mac",
     console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "14",
@@ -5305,10 +5582,9 @@ ci.thin_tester(
     triggered_by = ["ci/Mac Builder"],
 )
 
-ci.thin_tester(
+ci.mac_thin_tester(
     name = "Mac10.15 Tests",
     branch_selector = branches.STANDARD_MILESTONE,
-    builder_group = "chromium.mac",
     console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "15",
@@ -5318,12 +5594,11 @@ ci.thin_tester(
     triggered_by = ["ci/Mac Builder"],
 )
 
-ci.thin_tester(
+ci.mac_thin_tester(
     name = "Mac11 Tests",
     # TODO(crbug.com/1206401): Reenable on the branches when we have
     # sufficient capacity.
     # branch_selector = branches.STANDARD_MILESTONE,
-    builder_group = "chromium.mac",
     console_view_entry = consoles.console_view_entry(
         category = "mac",
         short_name = "11",
@@ -5332,10 +5607,9 @@ ci.thin_tester(
     triggered_by = ["ci/Mac Builder"],
 )
 
-ci.thin_tester(
+ci.mac_thin_tester(
     name = "Mac10.15 Tests (dbg)",
     branch_selector = branches.STANDARD_MILESTONE,
-    builder_group = "chromium.mac",
     console_view_entry = consoles.console_view_entry(
         category = "debug",
         short_name = "15",
@@ -5422,22 +5696,6 @@ ci.mac_ios_builder(
 )
 
 ci.memory_builder(
-    name = "Android CFI",
-    console_view_entry = consoles.console_view_entry(
-        # TODO(https://crbug.com/1008094) When this builder is not consistently
-        # failing, remove the console_view value
-        console_view = "chromium.android.fyi",
-        category = "memory",
-        short_name = "cfi",
-    ),
-    cores = 32,
-    # TODO(https://crbug.com/919430) Remove the larger timeout once compile
-    # times have been brought down to reasonable level
-    execution_timeout = 4 * time.hour + 30 * time.minute,
-    tree_closing = False,
-)
-
-ci.memory_builder(
     name = "Linux ASan LSan Builder",
     branch_selector = branches.STANDARD_MILESTONE,
     console_view_entry = consoles.console_view_entry(
@@ -5577,6 +5835,20 @@ ci.memory_builder(
     ),
 )
 
+# TODO(https://crbug.com/1200904): Remove this after migration
+ci.memory_builder(
+    name = "Linux TSan (bionic)",
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
+        category = "linux|TSan v2",
+        short_name = "tst",
+    ),
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
+    tree_closing = False,
+    os = os.LINUX_BIONIC,
+)
+
 ci.memory_builder(
     name = "Linux TSan Tests",
     branch_selector = branches.STANDARD_MILESTONE,
@@ -5608,6 +5880,7 @@ ci.memory_builder(
         short_name = "asn",
     ),
     main_console_view = "main",
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.memory_builder(
@@ -5617,6 +5890,7 @@ ci.memory_builder(
         short_name = "lk",
     ),
     main_console_view = "main",
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.memory_builder(
@@ -5626,6 +5900,7 @@ ci.memory_builder(
         short_name = "msn",
     ),
     main_console_view = "main",
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.memory_builder(
@@ -5635,6 +5910,7 @@ ci.memory_builder(
         short_name = "asn",
     ),
     main_console_view = "main",
+    sheriff_rotations = sheriff_rotations.ANDROID,
     tree_closing = False,
 )
 
@@ -5648,6 +5924,7 @@ ci.memory_builder(
     cores = 32,
     main_console_view = "main",
     tree_closing = False,
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 ci.memory_builder(
@@ -5958,7 +6235,7 @@ ci.cipd_builder(
     name = "rts-model-packager",
     builderless = False,
     executable = "recipe:chromium_rts/create_model",
-    schedule = "0 10 * * *",  # at 2 AM PST, once a day.
+    schedule = "0 7 * * *",  # at 12AM or 1AM PT (depending on DST), once a day.
     triggered_by = [],
     execution_timeout = 6 * time.hour,
     cores = None,
diff --git a/chromium/infra/config/subprojects/chromium/gpu.try.star b/chromium/infra/config/subprojects/chromium/gpu.try.star
index 06ea4892337..73a17dab887 100644
--- a/chromium/infra/config/subprojects/chromium/gpu.try.star
+++ b/chromium/infra/config/subprojects/chromium/gpu.try.star
@@ -396,11 +396,6 @@ gpu_win_builder(
 )
 
 gpu_win_builder(
-    name = "gpu-fyi-try-win7-amd-dbg-32",
-    pool = "luci.chromium.gpu.win7.amd.try",
-)
-
-gpu_win_builder(
     name = "gpu-fyi-try-win7-amd-rel-32",
     pool = "luci.chromium.gpu.win7.amd.try",
 )
diff --git a/chromium/infra/config/subprojects/chromium/try.star b/chromium/infra/config/subprojects/chromium/try.star
index efd932b21f8..892d3d9ca10 100644
--- a/chromium/infra/config/subprojects/chromium/try.star
+++ b/chromium/infra/config/subprojects/chromium/try.star
@@ -54,13 +54,13 @@ luci.bucket(
                 "service-account-chromeperf",
                 "service-account-cq",
             ],
-            projects = branches.value(for_main = [
+            projects = [
                 "angle",
                 "dawn",
                 "skia",
                 "swiftshader",
                 "v8",
-            ]),
+            ] if settings.is_main else None,
         ),
         acl.entry(
             roles = acl.BUILDBUCKET_OWNER,
@@ -72,17 +72,13 @@ luci.bucket(
 luci.cq_group(
     name = "cq",
     retry_config = cq.RETRY_ALL_FAILURES,
-    tree_status_host = branches.value(for_main = "chromium-status.appspot.com"),
+    tree_status_host = "chromium-status.appspot.com" if settings.is_main else None,
     watch = cq.refset(
         repo = "https://chromium.googlesource.com/chromium/src",
-        refs = [branches.value(
-            # The chromium project's CQ covers all of the refs under refs/heads,
-            # which includes refs/heads/master
-            for_main = "refs/heads/.+",
-            # For projects running out of a branch, the CQ only runs for that
-            # ref
-            for_branches = settings.ref,
-        )],
+        # The chromium project's CQ covers all of the refs under refs/heads,
+        # which includes refs/heads/main, for projects running out of a branch
+        # the CQ only runs for that ref
+        refs = ["refs/heads/.+" if settings.is_main else settings.ref],
     ),
     acls = [
         acl.entry(
@@ -172,6 +168,7 @@ try_.builder(
     name = "branch-config-verifier",
     executable = "recipe:branch_configuration/tester",
     main_list_view = "try",
+    os = os.LINUX_BIONIC_REMOVE,
     properties = {
         "branch_script": "infra/config/scripts/branch.py",
         "branch_types": ["standard", "lts"],
@@ -326,6 +323,8 @@ try_.chromium_android_builder(
         },
     },
     tryjob = try_.job(),
+    # TODO(crbug/1202741)
+    os = os.LINUX_XENIAL_OR_BIONIC_REMOVE,
 )
 
 try_.chromium_android_builder(
@@ -369,22 +368,37 @@ try_.chromium_android_builder(
     name = "android-lollipop-arm-rel",
     branch_selector = branches.STANDARD_MILESTONE,
     builderless = not settings.is_main,
-    cores = branches.value(for_main = 16, for_branches = 8),
+    cores = 16 if settings.is_main else 8,
     goma_jobs = goma.jobs.J150,
     main_list_view = "try",
     tryjob = try_.job(),
+    # TODO(crbug/1202741)
+    os = os.LINUX_XENIAL_OR_BIONIC_REMOVE,
 )
 
 try_.chromium_android_builder(
     name = "android-marshmallow-arm64-rel",
     branch_selector = branches.STANDARD_MILESTONE,
     builderless = not settings.is_main,
-    cores = branches.value(for_main = 32, for_branches = 16),
+    cores = 32 if settings.is_main else 16,
     goma_jobs = goma.jobs.J300,
     main_list_view = "try",
     ssd = True,
     use_java_coverage = True,
     tryjob = try_.job(),
+    # TODO(crbug/1202741)
+    os = os.LINUX_XENIAL_OR_BIONIC_REMOVE,
+)
+
+# Experimental builder to check dual coverage on android platform.
+try_.chromium_android_builder(
+    name = "android-marshmallow-arm64-rel-dual-coverage",
+    builderless = True,
+    cores = 16,
+    goma_jobs = goma.jobs.J300,
+    ssd = True,
+    use_java_coverage = True,
+    tryjob = try_.job(experiment_percentage = 3),
 )
 
 try_.chromium_android_builder(
@@ -395,6 +409,8 @@ try_.chromium_android_builder(
     goma_jobs = goma.jobs.J300,
     ssd = True,
     tryjob = try_.job(),
+    # TODO(crbug/1202741)
+    os = os.LINUX_XENIAL_OR_BIONIC_REMOVE,
 )
 
 try_.chromium_android_builder(
@@ -468,6 +484,8 @@ try_.chromium_android_builder(
     ssd = True,
     main_list_view = "try",
     tryjob = try_.job(),
+    # TODO(crbug/1202741)
+    os = os.LINUX_XENIAL_OR_BIONIC_REMOVE,
 )
 
 try_.chromium_android_builder(
@@ -493,6 +511,10 @@ try_.chromium_android_builder(
 )
 
 try_.chromium_android_builder(
+    name = "android-weblayer-marshmallow-x86-rel-tests",
+)
+
+try_.chromium_android_builder(
     name = "android-weblayer-pie-x86-rel-tests",
 )
 
@@ -501,6 +523,14 @@ try_.chromium_android_builder(
 )
 
 try_.chromium_android_builder(
+    name = "android-weblayer-pie-x86-wpt-smoketest",
+)
+
+try_.chromium_android_builder(
+    name = "android-webview-pie-x86-wpt-fyi-rel",
+)
+
+try_.chromium_android_builder(
     name = "android-webview-marshmallow-arm64-dbg",
 )
 
@@ -550,6 +580,8 @@ try_.chromium_android_builder(
     goma_jobs = goma.jobs.J150,
     main_list_view = "try",
     tryjob = try_.job(),
+    # TODO(crbug/1202741)
+    os = os.LINUX_XENIAL_OR_BIONIC_REMOVE,
 )
 
 try_.chromium_android_builder(
@@ -594,6 +626,8 @@ try_.chromium_android_builder(
     builderless = not settings.is_main,
     main_list_view = "try",
     tryjob = try_.job(),
+    # TODO(crbug/1202741)
+    os = os.LINUX_XENIAL_OR_BIONIC_REMOVE,
 )
 
 try_.chromium_android_builder(
@@ -614,6 +648,8 @@ try_.chromium_android_builder(
     builderless = not settings.is_main,
     main_list_view = "try",
     tryjob = try_.job(),
+    # TODO(crbug/1202741)
+    os = os.LINUX_XENIAL_OR_BIONIC_REMOVE,
 )
 
 try_.chromium_android_builder(
@@ -688,15 +724,6 @@ try_.chromium_angle_builder(
 )
 
 try_.chromium_angle_builder(
-    name = "linux_angle_ozone_rel_ng",
-)
-
-try_.chromium_angle_builder(
-    name = "linux-ozone-angle-try",
-    executable = "recipe:angle_chromium_trybot",
-)
-
-try_.chromium_angle_builder(
     name = "mac-angle-chromium-try",
     cores = None,
     os = os.MAC_ANY,
@@ -755,6 +782,7 @@ try_.chromium_chromiumos_builder(
     branch_selector = branches.LTS_MILESTONE,
     builderless = not settings.is_main,
     main_list_view = "try",
+    os = os.LINUX_BIONIC_REMOVE,
     tryjob = try_.job(),
 )
 
@@ -771,6 +799,7 @@ try_.chromium_chromiumos_builder(
     branch_selector = branches.LTS_MILESTONE,
     builderless = not settings.is_main,
     main_list_view = "try",
+    os = os.LINUX_BIONIC_REMOVE,
     tryjob = try_.job(),
 )
 
@@ -779,6 +808,7 @@ try_.chromium_chromiumos_builder(
     builderless = not settings.is_main,
     main_list_view = "try",
     tryjob = try_.job(),
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 try_.chromium_chromiumos_builder(
@@ -786,6 +816,7 @@ try_.chromium_chromiumos_builder(
     branch_selector = branches.STANDARD_MILESTONE,
     builderless = not settings.is_main,
     main_list_view = "try",
+    os = os.LINUX_BIONIC_REMOVE,
     tryjob = try_.job(),
 )
 
@@ -818,6 +849,8 @@ try_.chromium_chromiumos_builder(
     main_list_view = "try",
     tryjob = try_.job(),
     use_clang_coverage = True,
+    os = os.LINUX_BIONIC_REMOVE,
+    coverage_test_types = ["unit", "overall"],
 )
 
 try_.chromium_chromiumos_builder(
@@ -834,6 +867,7 @@ try_.chromium_chromiumos_builder(
     goma_jobs = goma.jobs.J300,
     main_list_view = "try",
     tryjob = try_.job(),
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 try_.chromium_chromiumos_builder(
@@ -974,6 +1008,17 @@ try_.chromium_linux_builder(
 )
 
 try_.chromium_linux_builder(
+    name = "cast_shell_linux_dbg",
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
+    tryjob = try_.job(
+        location_regexp = [
+            ".+/[+]/chromecast/.+",
+        ],
+    ),
+)
+
+try_.chromium_linux_builder(
     name = "cast-binary-size",
     builderless = True,
     executable = "recipe:binary_size_cast_trybot",
@@ -1011,6 +1056,7 @@ try_.chromium_linux_builder(
         disable_reuse = True,
         add_default_excludes = False,
     ),
+    os = os.LINUX_BIONIC_REMOVE,
 )
 
 try_.chromium_linux_builder(
@@ -1089,6 +1135,15 @@ try_.chromium_linux_builder(
 )
 
 try_.chromium_linux_builder(
+    name = "linux-1mbu-compile-fyi-rel",
+    properties = {
+        "bot_update_experiments": [
+            "no_sync",
+        ],
+    },
+)
+
+try_.chromium_linux_builder(
     name = "linux-annotator-rel",
 )
 
@@ -1101,6 +1156,12 @@ try_.chromium_linux_builder(
 )
 
 try_.chromium_linux_builder(
+    name = "linux-bionic-rel",
+    goma_jobs = goma.jobs.J150,
+    os = os.LINUX_BIONIC,
+)
+
+try_.chromium_linux_builder(
     name = "linux-blink-heap-concurrent-marking-tsan-rel",
 )
 
@@ -1162,6 +1223,10 @@ try_.chromium_linux_builder(
 )
 
 try_.chromium_linux_builder(
+    name = "linux-lacros-version-skew-fyi",
+)
+
+try_.chromium_linux_builder(
     name = "linux-layout-tests-edit-ng",
 )
 
@@ -1204,7 +1269,7 @@ try_.chromium_linux_builder(
     main_list_view = "try",
     tryjob = try_.job(),
     use_clang_coverage = True,
-    os = os.LINUX_XENIAL_OR_BIONIC_REMOVE,
+    coverage_test_types = ["unit", "overall"],
 )
 
 try_.chromium_linux_builder(
@@ -1243,19 +1308,15 @@ try_.chromium_linux_builder(
 )
 
 try_.chromium_linux_builder(
-    name = "linux-rel-rts",
-    builderless = False,
+    name = "linux-trusty-rel",
     goma_jobs = goma.jobs.J150,
-    use_clang_coverage = True,
-    tryjob = try_.job(
-        experiment_percentage = 5,
-    ),
+    os = os.LINUX_TRUSTY,
 )
 
 try_.chromium_linux_builder(
-    name = "linux-trusty-rel",
+    name = "linux-xenial-rel",
     goma_jobs = goma.jobs.J150,
-    os = os.LINUX_TRUSTY,
+    os = os.LINUX_XENIAL,
 )
 
 try_.chromium_linux_builder(
@@ -1293,7 +1354,6 @@ try_.chromium_linux_builder(
     ssd = True,
     main_list_view = "try",
     tryjob = try_.job(),
-    os = os.LINUX_BIONIC,
 )
 
 try_.chromium_linux_builder(
@@ -1366,6 +1426,16 @@ try_.chromium_linux_builder(
     goma_jobs = goma.jobs.J150,
 )
 
+# TODO(crbug.com/1200904): Remove after migration
+try_.chromium_linux_builder(
+    name = "linux_chromium_tsan_rel_ng_bionic",
+    branch_selector = branches.STANDARD_MILESTONE,
+    builderless = not settings.is_main,
+    goma_jobs = goma.jobs.J150,
+    os = os.LINUX_BIONIC,
+    main_list_view = "try",
+)
+
 try_.chromium_linux_builder(
     name = "linux_chromium_tsan_rel_ng",
     branch_selector = branches.STANDARD_MILESTONE,
@@ -1373,7 +1443,6 @@ try_.chromium_linux_builder(
     goma_jobs = goma.jobs.J150,
     main_list_view = "try",
     tryjob = try_.job(),
-    os = os.LINUX_BIONIC_REMOVE,
 )
 
 try_.chromium_linux_builder(
@@ -1568,7 +1637,7 @@ try_.chromium_mac_ios_builder(
     main_list_view = "try",
     use_clang_coverage = True,
     coverage_exclude_sources = "ios_test_files_and_test_utils",
-    coverage_test_types = ["unit"],
+    coverage_test_types = ["overall", "unit"],
     tryjob = try_.job(),
 )
 
@@ -1594,7 +1663,7 @@ try_.chromium_mac_ios_builder(
     main_list_view = "try",
     use_clang_coverage = True,
     coverage_exclude_sources = "ios_test_files_and_test_utils",
-    coverage_test_types = ["unit"],
+    coverage_test_types = ["overall", "unit"],
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/ios/.+",
@@ -1624,11 +1693,13 @@ try_.chromium_mac_ios_builder(
 
 try_.chromium_mac_ios_builder(
     name = "ios14-beta-simulator",
+    os = os.MAC_11,
 )
 
 try_.chromium_mac_ios_builder(
     name = "ios14-sdk-simulator",
-    xcode = xcode.x12d4e,
+    os = os.MAC_11,
+    xcode = xcode.x12e262,
 )
 
 try_.chromium_updater_mac_builder(
@@ -1743,9 +1814,9 @@ try_.chromium_win_builder(
 )
 
 try_.chromium_win_builder(
-    name = "win10_chromium_x64_1909_fyi_rel_ng",
+    name = "win10_chromium_x64_20h2_fyi_rel_ng",
     builderless = False,
-    os = os.WINDOWS_10_1909,
+    os = os.WINDOWS_10_20h2,
 )
 
 try_.chromium_win_builder(
@@ -1761,11 +1832,12 @@ try_.chromium_win_builder(
 try_.chromium_win_builder(
     name = "win10_chromium_x64_rel_ng",
     branch_selector = branches.STANDARD_MILESTONE,
-    goma_jobs = goma.jobs.J150,
+    goma_jobs = goma.jobs.J300,
     os = os.WINDOWS_10,
     cores = 16,
     ssd = True,
     use_clang_coverage = True,
+    coverage_test_types = ["unit", "overall"],
     main_list_view = "try",
     tryjob = try_.job(),
 )
@@ -1793,11 +1865,27 @@ try_.chromium_win_builder(
 
 try_.cipd_3pp_builder(
     name = "3pp-linux-amd64-packager",
-    os = os.LINUX_DEFAULT,
+    os = os.LINUX_XENIAL_OR_BIONIC_SWITCH_TO_DEFAULT,
     builderless = False,
     properties = {
+        # TODO(hypan): Remove these two properties after chromium_3pp is
+        # migrated to a recipe module (crrev.com/c/2870555)
         "platform": "linux-amd64",
         "package_prefix": "chromium_3pp",
+        "$build/chromium_3pp": {
+            "platform": "linux-amd64",
+            "package_prefix": "chromium_3pp",
+            "preprocess": [{
+                "name": "third_party/android_deps",
+                "cmd": [
+                    "{CHECKOUT}/src/third_party/android_deps/fetch_all.py",
+                    "-v",
+                    "--ignore-vulnerabilities",
+                ],
+            }],
+            "gclient_config": "chromium",
+            "gclient_apply_config": ["android"],
+        },
     },
     tryjob = try_.job(
         location_regexp = [
@@ -1821,11 +1909,17 @@ try_.gpu_chromium_android_builder(
             ".+/[+]/content/test/gpu/.+",
             ".+/[+]/gpu/.+",
             ".+/[+]/media/audio/.+",
+            ".+/[+]/media/base/.+",
+            ".+/[+]/media/capture/.+",
             ".+/[+]/media/filters/.+",
             ".+/[+]/media/gpu/.+",
+            ".+/[+]/media/mojo/.+",
             ".+/[+]/media/renderers/.+",
+            ".+/[+]/media/video/.+",
             ".+/[+]/services/viz/.+",
             ".+/[+]/testing/trigger_scripts/.+",
+            ".+/[+]/third_party/blink/renderer/modules/mediastream/.+",
+            ".+/[+]/third_party/blink/renderer/modules/webcodecs/.+",
             ".+/[+]/third_party/blink/renderer/modules/webgl/.+",
             ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+",
             ".+/[+]/tools/clang/scripts/update.py",
@@ -1845,11 +1939,17 @@ try_.gpu_chromium_linux_builder(
             ".+/[+]/content/test/gpu/.+",
             ".+/[+]/gpu/.+",
             ".+/[+]/media/audio/.+",
+            ".+/[+]/media/base/.+",
+            ".+/[+]/media/capture/.+",
             ".+/[+]/media/filters/.+",
             ".+/[+]/media/gpu/.+",
+            ".+/[+]/media/mojo/.+",
             ".+/[+]/media/renderers/.+",
+            ".+/[+]/media/video/.+",
             ".+/[+]/testing/buildbot/chromium.gpu.fyi.json",
             ".+/[+]/testing/trigger_scripts/.+",
+            ".+/[+]/third_party/blink/renderer/modules/mediastream/.+",
+            ".+/[+]/third_party/blink/renderer/modules/webcodecs/.+",
             ".+/[+]/third_party/blink/renderer/modules/webgl/.+",
             ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+",
             ".+/[+]/tools/clang/scripts/update.py",
@@ -1869,12 +1969,18 @@ try_.gpu_chromium_mac_builder(
             ".+/[+]/content/test/gpu/.+",
             ".+/[+]/gpu/.+",
             ".+/[+]/media/audio/.+",
+            ".+/[+]/media/base/.+",
+            ".+/[+]/media/capture/.+",
             ".+/[+]/media/filters/.+",
             ".+/[+]/media/gpu/.+",
+            ".+/[+]/media/mojo/.+",
             ".+/[+]/media/renderers/.+",
+            ".+/[+]/media/video/.+",
             ".+/[+]/services/shape_detection/.+",
             ".+/[+]/testing/buildbot/chromium.gpu.fyi.json",
             ".+/[+]/testing/trigger_scripts/.+",
+            ".+/[+]/third_party/blink/renderer/modules/mediastream/.+",
+            ".+/[+]/third_party/blink/renderer/modules/webcodecs/.+",
             ".+/[+]/third_party/blink/renderer/modules/webgl/.+",
             ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+",
             ".+/[+]/tools/clang/scripts/update.py",
@@ -1897,12 +2003,18 @@ try_.gpu_chromium_win_builder(
             ".+/[+]/device/vr/.+",
             ".+/[+]/gpu/.+",
             ".+/[+]/media/audio/.+",
+            ".+/[+]/media/base/.+",
+            ".+/[+]/media/capture/.+",
             ".+/[+]/media/filters/.+",
             ".+/[+]/media/gpu/.+",
+            ".+/[+]/media/mojo/.+",
             ".+/[+]/media/renderers/.+",
+            ".+/[+]/media/video/.+",
             ".+/[+]/testing/buildbot/chromium.gpu.fyi.json",
             ".+/[+]/testing/trigger_scripts/.+",
             ".+/[+]/third_party/blink/renderer/modules/vr/.+",
+            ".+/[+]/third_party/blink/renderer/modules/mediastream/.+",
+            ".+/[+]/third_party/blink/renderer/modules/webcodecs/.+",
             ".+/[+]/third_party/blink/renderer/modules/webgl/.+",
             ".+/[+]/third_party/blink/renderer/modules/xr/.+",
             ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+",
@@ -1912,6 +2024,80 @@ try_.gpu_chromium_win_builder(
     ),
 )
 
+# RTS builders (https://crbug.com/1203048)
+try_.chromium_linux_builder(
+    name = "linux-rel-rts",
+    builderless = False,
+    goma_jobs = goma.jobs.J150,
+    use_clang_coverage = True,
+    tryjob = try_.job(
+        experiment_percentage = 5,
+    ),
+    os = os.LINUX_XENIAL_OR_BIONIC_REMOVE,
+)
+
+try_.chromium_mac_builder(
+    name = "mac-rel-rts",
+    builderless = False,
+    use_clang_coverage = True,
+    goma_jobs = goma.jobs.J150,
+    tryjob = try_.job(
+        experiment_percentage = 1,
+    ),
+)
+
+try_.chromium_win_builder(
+    name = "win10_chromium_x64_rel_ng_rts",
+    goma_jobs = goma.jobs.J150,
+    use_clang_coverage = True,
+    builderless = False,
+    cores = 16,
+    tryjob = try_.job(
+        experiment_percentage = 5,
+    ),
+)
+
+try_.chromium_android_builder(
+    name = "android-marshmallow-x86-rel-rts",
+    goma_jobs = goma.jobs.J300,
+    builderless = False,
+    cores = 16,
+    tryjob = try_.job(
+        experiment_percentage = 5,
+    ),
+    ssd = True,
+    os = os.LINUX_XENIAL_OR_BIONIC_REMOVE,
+)
+
+try_.chromium_linux_builder(
+    name = "fuchsia_x64_rts",
+    builderless = False,
+    tryjob = try_.job(
+        experiment_percentage = 5,
+    ),
+    os = os.LINUX_XENIAL_OR_BIONIC_REMOVE,
+)
+
+try_.chromium_chromiumos_builder(
+    name = "chromeos-amd64-generic-rel-rts",
+    builderless = False,
+    tryjob = try_.job(
+        experiment_percentage = 5,
+    ),
+    os = os.LINUX_XENIAL_OR_BIONIC_REMOVE,
+)
+
+try_.chromium_mac_ios_builder(
+    name = "ios-simulator-rts",
+    use_clang_coverage = True,
+    coverage_exclude_sources = "ios_test_files_and_test_utils",
+    coverage_test_types = ["unit"],
+    builderless = False,
+    tryjob = try_.job(
+        experiment_percentage = 1,
+    ),
+)
+
 # Used for listing chrome trybots in chromium's commit-queue.cfg without also
 # adding them to chromium's cr-buildbucket.cfg. Note that the recipe these
 # builders run allow only known roller accounts when triggered via the CQ.
@@ -1967,6 +2153,10 @@ chrome_internal_verifier(
 )
 
 chrome_internal_verifier(
+    builder = "lacros-arm-generic-chrome",
+)
+
+chrome_internal_verifier(
     builder = "linux-chrome",
     branch_selector = branches.STANDARD_MILESTONE,
 )
diff --git a/chromium/infra/config/subprojects/codesearch/codesearch.star b/chromium/infra/config/subprojects/codesearch/codesearch.star
index 3d99160b0a4..a2bcd142aed 100644
--- a/chromium/infra/config/subprojects/codesearch/codesearch.star
+++ b/chromium/infra/config/subprojects/codesearch/codesearch.star
@@ -35,7 +35,7 @@ try_.defaults.executable.set("recipe:chromium_codesearch")
 try_.defaults.execution_timeout.set(9 * time.hour)
 try_.defaults.expiration_timeout.set(2 * time.hour)
 try_.defaults.goma_backend.set(goma.backend.RBE_PROD)
-try_.defaults.os.set(os.LINUX_DEFAULT)
+try_.defaults.os.set(os.LINUX_BIONIC_SWITCH_TO_DEFAULT)
 try_.defaults.pool.set("luci.chromium.try")
 try_.defaults.service_account.set("chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com")
 try_.defaults.swarming_tags.set(["vpython:native-python-wrapper"])
@@ -53,27 +53,22 @@ consoles.list_view(
 
 try_.builder(
     name = "gen-android-try",
-    os = os.LINUX_BIONIC,
 )
 
 try_.builder(
     name = "gen-chromiumos-try",
-    os = os.LINUX_BIONIC,
 )
 
 try_.builder(
     name = "gen-fuchsia-try",
-    os = os.LINUX_BIONIC,
 )
 
 try_.builder(
     name = "gen-lacros-try",
-    os = os.LINUX_BIONIC,
 )
 
 try_.builder(
     name = "gen-linux-try",
-    os = os.LINUX_BIONIC,
 )
 
 try_.builder(
diff --git a/chromium/infra/config/subprojects/findit/findit.star b/chromium/infra/config/subprojects/findit/findit.star
index 69e5153b8bf..3870be6371e 100644
--- a/chromium/infra/config/subprojects/findit/findit.star
+++ b/chromium/infra/config/subprojects/findit/findit.star
@@ -79,7 +79,7 @@ builder(
 builder(
     name = "linux_chromium_bot_db_exporter",
     executable = "recipe:findit/chromium/export_bot_db",
-    os = os.LINUX_DEFAULT,
+    os = os.LINUX_XENIAL_OR_BIONIC_SWITCH_TO_DEFAULT,
     properties = {
         "gs_bucket": "findit-for-me",
         "gs_object": "bot_db.json",
diff --git a/chromium/infra/config/subprojects/goma/consoles/chromium.goma.fyi.star b/chromium/infra/config/subprojects/goma/consoles/chromium.goma.fyi.star
index acb364d5d0f..44c195928bc 100644
--- a/chromium/infra/config/subprojects/goma/consoles/chromium.goma.fyi.star
+++ b/chromium/infra/config/subprojects/goma/consoles/chromium.goma.fyi.star
@@ -60,5 +60,15 @@ luci.console_view(
             builder = "goma/Win Builder (dbg) Goma RBE Canary",
             category = "rbe|win|dbg",
         ),
+        luci.console_view_entry(
+            builder = "goma/Win Builder Goma RBE ATS Canary",
+            category = "rbe|win|rel",
+            short_name = "ats",
+        ),
+        luci.console_view_entry(
+            builder = "goma/Win Builder (dbg) Goma RBE ATS Canary",
+            category = "rbe|win|dbg",
+            short_name = "ats",
+        ),
     ],
 )
diff --git a/chromium/infra/config/subprojects/goma/consoles/chromium.goma.star b/chromium/infra/config/subprojects/goma/consoles/chromium.goma.star
index e371b502d84..3f413f1fe6b 100644
--- a/chromium/infra/config/subprojects/goma/consoles/chromium.goma.star
+++ b/chromium/infra/config/subprojects/goma/consoles/chromium.goma.star
@@ -28,6 +28,11 @@ luci.console_view(
             category = "rbe|tot|win|rel",
         ),
         luci.console_view_entry(
+            builder = "goma/Chromium Win Goma RBE ATS ToT",
+            category = "rbe|tot|win|rel",
+            short_name = "ats",
+        ),
+        luci.console_view_entry(
             builder = "goma/Chromium iOS Goma RBE ToT",
             category = "rbe|tot|ios|rel",
         ),
@@ -80,11 +85,21 @@ luci.console_view(
             category = "rbe|staging|win|rel",
         ),
         luci.console_view_entry(
+            builder = "goma/Chromium Win Goma RBE ATS Staging",
+            category = "rbe|staging|win|rel",
+            short_name = "ats",
+        ),
+        luci.console_view_entry(
             builder = "goma/Chromium Win Goma RBE Staging (clobber)",
             category = "rbe|staging|win|rel",
             short_name = "clb",
         ),
         luci.console_view_entry(
+            builder = "goma/Chromium Win Goma RBE ATS Staging (clobber)",
+            category = "rbe|staging|win|rel",
+            short_name = "ats",
+        ),
+        luci.console_view_entry(
             builder = "goma/Chromium Android ARM 32-bit Goma RBE Staging",
             category = "rbe|staging|android arm|rel",
         ),
diff --git a/chromium/infra/config/subprojects/goma/consoles/goma.latest.star b/chromium/infra/config/subprojects/goma/consoles/goma.latest.star
index fc611fd9aa2..de47a7f6b88 100644
--- a/chromium/infra/config/subprojects/goma/consoles/goma.latest.star
+++ b/chromium/infra/config/subprojects/goma/consoles/goma.latest.star
@@ -59,5 +59,15 @@ luci.console_view(
             builder = "goma/Win Builder (dbg) Goma RBE Latest Client",
             category = "rbe|win|dbg",
         ),
+        luci.console_view_entry(
+            builder = "goma/Win Builder Goma RBE ATS Latest Client",
+            category = "rbe|win|rel",
+            short_name = "ats",
+        ),
+        luci.console_view_entry(
+            builder = "goma/Win Builder (dbg) Goma RBE ATS Latest Client",
+            category = "rbe|win|dbg",
+            short_name = "ats",
+        ),
     ],
 )
diff --git a/chromium/infra/config/subprojects/goma/goma.star b/chromium/infra/config/subprojects/goma/goma.star
index 4680e9e8136..ab5967f68ac 100644
--- a/chromium/infra/config/subprojects/goma/goma.star
+++ b/chromium/infra/config/subprojects/goma/goma.star
@@ -51,7 +51,7 @@ def fyi_goma_rbe_canary_builder(
         *,
         name,
         goma_backend = goma.backend.RBE_PROD,
-        os = os.LINUX_DEFAULT,
+        os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
         **kwargs):
     return builder(
         name = name,
@@ -112,12 +112,24 @@ fyi_goma_rbe_canary_builder(
 
 fyi_goma_rbe_canary_builder(
     name = "Win Builder (dbg) Goma RBE Canary",
-    goma_enable_ats = True,
+    goma_enable_ats = False,
     os = os.WINDOWS_DEFAULT,
 )
 
 fyi_goma_rbe_canary_builder(
     name = "Win Builder Goma RBE Canary",
+    goma_enable_ats = False,
+    os = os.WINDOWS_DEFAULT,
+)
+
+fyi_goma_rbe_canary_builder(
+    name = "Win Builder (dbg) Goma RBE ATS Canary",
+    goma_enable_ats = True,
+    os = os.WINDOWS_DEFAULT,
+)
+
+fyi_goma_rbe_canary_builder(
+    name = "Win Builder Goma RBE ATS Canary",
     goma_enable_ats = True,
     os = os.WINDOWS_DEFAULT,
 )
@@ -126,7 +138,7 @@ def fyi_goma_rbe_latest_client_builder(
         *,
         name,
         goma_backend = goma.backend.RBE_PROD,
-        os = os.LINUX_DEFAULT,
+        os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
         **kwargs):
     return builder(
         name = name,
@@ -150,14 +162,24 @@ fyi_goma_rbe_latest_client_builder(
 
 fyi_goma_rbe_latest_client_builder(
     name = "Win Builder (dbg) Goma RBE Latest Client",
-    goma_backend = goma.backend.RBE_STAGING,
-    goma_enable_ats = True,
+    goma_enable_ats = False,
     os = os.WINDOWS_DEFAULT,
 )
 
 fyi_goma_rbe_latest_client_builder(
     name = "Win Builder Goma RBE Latest Client",
-    goma_backend = goma.backend.RBE_STAGING,
+    goma_enable_ats = False,
+    os = os.WINDOWS_DEFAULT,
+)
+
+fyi_goma_rbe_latest_client_builder(
+    name = "Win Builder (dbg) Goma RBE ATS Latest Client",
+    goma_enable_ats = True,
+    os = os.WINDOWS_DEFAULT,
+)
+
+fyi_goma_rbe_latest_client_builder(
+    name = "Win Builder Goma RBE ATS Latest Client",
     goma_enable_ats = True,
     os = os.WINDOWS_DEFAULT,
 )
@@ -203,7 +225,7 @@ def goma_builder(
         *,
         name,
         builderless = False,
-        os = os.LINUX_DEFAULT,
+        os = os.LINUX_XENIAL_OR_BIONIC_SWITCH_TO_DEFAULT,
         **kwargs):
     return builder(
         name = name,
@@ -216,18 +238,21 @@ def goma_builder(
 goma_builder(
     name = "Chromium Android ARM 32-bit Goma RBE Staging",
     goma_backend = goma.backend.RBE_STAGING,
+    execution_timeout = 4 * time.hour,
 )
 
 goma_builder(
     name = "Chromium Android ARM 32-bit Goma RBE ToT",
     goma_backend = goma.backend.RBE_TOT,
     goma_enable_ats = False,
+    execution_timeout = 4 * time.hour,
 )
 
 goma_builder(
     name = "Chromium Android ARM 32-bit Goma RBE ToT (ATS)",
     goma_backend = goma.backend.RBE_TOT,
     goma_enable_ats = True,
+    execution_timeout = 4 * time.hour,
 )
 
 goma_builder(
@@ -318,11 +343,10 @@ def goma_windows_builder(
         *,
         name,
         goma_enable_ats = True,
-        cores = 32,
         **kwargs):
+    kwargs["execution_timeout"] = 4 * time.hour
     return goma_builder(
         name = name,
-        cores = cores,
         goma_enable_ats = goma_enable_ats,
         os = os.WINDOWS_DEFAULT,
         **kwargs
@@ -331,14 +355,35 @@ def goma_windows_builder(
 goma_windows_builder(
     name = "Chromium Win Goma RBE Staging",
     goma_backend = goma.backend.RBE_STAGING,
+    goma_enable_ats = False,
 )
 
 goma_windows_builder(
     name = "Chromium Win Goma RBE Staging (clobber)",
     goma_backend = goma.backend.RBE_STAGING,
+    goma_enable_ats = False,
 )
 
 goma_windows_builder(
     name = "Chromium Win Goma RBE ToT",
     goma_backend = goma.backend.RBE_TOT,
+    goma_enable_ats = False,
+)
+
+goma_windows_builder(
+    name = "Chromium Win Goma RBE ATS Staging",
+    goma_backend = goma.backend.RBE_STAGING,
+    goma_enable_ats = True,
+)
+
+goma_windows_builder(
+    name = "Chromium Win Goma RBE ATS Staging (clobber)",
+    goma_backend = goma.backend.RBE_STAGING,
+    goma_enable_ats = True,
+)
+
+goma_windows_builder(
+    name = "Chromium Win Goma RBE ATS ToT",
+    goma_backend = goma.backend.RBE_TOT,
+    goma_enable_ats = True,
 )
diff --git a/chromium/infra/config/subprojects/reclient/OWNERS b/chromium/infra/config/subprojects/reclient/OWNERS
new file mode 100644
index 00000000000..29a7a4caac2
--- /dev/null
+++ b/chromium/infra/config/subprojects/reclient/OWNERS
@@ -0,0 +1,5 @@
+abdelaal@google.com
+foox@google.com
+kousikk@google.com
+msavigny@google.com
+rubensf@google.com
\ No newline at end of file
diff --git a/chromium/infra/config/subprojects/reclient/README.md b/chromium/infra/config/subprojects/reclient/README.md
new file mode 100644
index 00000000000..202039bc16c
--- /dev/null
+++ b/chromium/infra/config/subprojects/reclient/README.md
@@ -0,0 +1,4 @@
+Contains definitions for LUCI entities that test new releases of the reclient
+binaries used by chromium builders.
+
+* reclient.star - Builders that test staging and test versions of reclient.
\ No newline at end of file
diff --git a/chromium/infra/config/subprojects/reclient/reclient.star b/chromium/infra/config/subprojects/reclient/reclient.star
new file mode 100644
index 00000000000..953104ade6e
--- /dev/null
+++ b/chromium/infra/config/subprojects/reclient/reclient.star
@@ -0,0 +1,72 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+load("//lib/builders.star", "cpu", "os")
+load("//lib/ci.star", "ci")
+load("//lib/consoles.star", "consoles")
+load("//console-header.star", "HEADER")
+
+luci.bucket(
+    name = "reclient",
+    acls = [
+        acl.entry(
+            roles = acl.BUILDBUCKET_READER,
+            groups = "all",
+        ),
+        acl.entry(
+            roles = acl.BUILDBUCKET_TRIGGERER,
+            groups = "project-chromium-ci-schedulers",
+        ),
+        acl.entry(
+            roles = acl.BUILDBUCKET_OWNER,
+            groups = "google/luci-task-force@google.com",
+        ),
+    ],
+)
+
+ci.defaults.set(
+    bucket = "reclient",
+    build_numbers = True,
+    builder_group = "chromium.reclient.fyi",
+    configure_kitchen = True,
+    cores = 8,
+    cpu = cpu.X86_64,
+    executable = "recipe:chromium",
+    execution_timeout = 3 * time.hour,
+    goma_backend = None,
+    kitchen_emulate_gce = True,
+    os = os.LINUX_DEFAULT,
+    pool = "luci.chromium.ci",
+    service_account = (
+        "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+    ),
+    swarming_tags = ["vpython:native-python-wrapper"],
+    triggered_by = ["chromium-gitiles-trigger"],
+)
+
+consoles.console_view(
+    name = "chromium.reclient.fyi",
+    header = HEADER,
+    include_experimental_builds = True,
+    repo = "https://chromium.googlesource.com/chromium/src",
+)
+
+def fyi_reclient_staging_builder(
+        *,
+        name,
+        reclient_instance = "rbe-chromium-trusted",
+        **kwargs):
+    return ci.builder(
+        name = name,
+        reclient_instance = reclient_instance,
+        console_view_entry = consoles.console_view_entry(
+            category = "rbe|linux",
+            short_name = "rcs",
+        ),
+        **kwargs
+    )
+
+fyi_reclient_staging_builder(
+    name = "Linux Builder Re-Client Staging",
+)
diff --git a/chromium/infra/config/subprojects/reclient/subproject.star b/chromium/infra/config/subprojects/reclient/subproject.star
new file mode 100644
index 00000000000..9c5021130ad
--- /dev/null
+++ b/chromium/infra/config/subprojects/reclient/subproject.star
@@ -0,0 +1,5 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+exec("./reclient.star")
diff --git a/chromium/infra/config/subprojects/webrtc/OWNERS b/chromium/infra/config/subprojects/webrtc/OWNERS
new file mode 100644
index 00000000000..35aab6c5f29
--- /dev/null
+++ b/chromium/infra/config/subprojects/webrtc/OWNERS
@@ -0,0 +1,4 @@
+jansson@chromium.org
+landrey@google.com
+mbonadei@chromium.org
+terelius@chromium.org
diff --git a/chromium/infra/config/subprojects/webrtc/webrtc.fyi.star b/chromium/infra/config/subprojects/webrtc/webrtc.fyi.star
index 0d737763cd4..67501b0d58c 100644
--- a/chromium/infra/config/subprojects/webrtc/webrtc.fyi.star
+++ b/chromium/infra/config/subprojects/webrtc/webrtc.fyi.star
@@ -39,7 +39,7 @@ defaults.build_numbers.set(True)
 defaults.cpu.set(cpu.X86_64)
 defaults.executable.set("recipe:chromium")
 defaults.execution_timeout.set(2 * time.hour)
-defaults.os.set(os.LINUX_DEFAULT)
+defaults.os.set(os.LINUX_XENIAL_OR_BIONIC_REMOVE)
 defaults.pool.set("luci.chromium.webrtc.fyi")
 defaults.service_account.set("chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com")
 defaults.swarming_tags.set(["vpython:native-python-wrapper"])
@@ -110,12 +110,14 @@ builder(
 builder(
     name = "WebRTC Chromium FYI Win Builder",
     goma_backend = goma.backend.RBE_PROD,
+    goma_enable_ats = True,
     os = os.WINDOWS_DEFAULT,
 )
 
 builder(
     name = "WebRTC Chromium FYI Win Builder (dbg)",
     goma_backend = goma.backend.RBE_PROD,
+    goma_enable_ats = True,
     os = os.WINDOWS_DEFAULT,
 )
 
diff --git a/chromium/infra/config/subprojects/webrtc/webrtc.star b/chromium/infra/config/subprojects/webrtc/webrtc.star
index b7d6542cb18..e1e8f00ac20 100644
--- a/chromium/infra/config/subprojects/webrtc/webrtc.star
+++ b/chromium/infra/config/subprojects/webrtc/webrtc.star
@@ -33,7 +33,7 @@ defaults.build_numbers.set(True)
 defaults.cpu.set(cpu.X86_64)
 defaults.executable.set("recipe:chromium")
 defaults.execution_timeout.set(2 * time.hour)
-defaults.os.set(os.LINUX_DEFAULT)
+defaults.os.set(os.LINUX_XENIAL_OR_BIONIC_REMOVE)
 defaults.service_account.set("chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com")
 defaults.swarming_tags.set(["vpython:native-python-wrapper"])
 defaults.triggered_by.set(["chromium-gitiles-trigger"])
@@ -62,7 +62,6 @@ builder(
 builder(
     name = "WebRTC Chromium Linux Tester",
     triggered_by = ["WebRTC Chromium Linux Builder"],
-    os = os.LINUX_BIONIC,
 )
 
 builder(
@@ -81,6 +80,7 @@ builder(
 builder(
     name = "WebRTC Chromium Win Builder",
     goma_backend = goma.backend.RBE_PROD,
+    goma_enable_ats = True,
     os = os.WINDOWS_ANY,
 )
 
diff --git a/chromium/infra/config/swarming.star b/chromium/infra/config/swarming.star
index ece8877ffd3..875221bfa34 100644
--- a/chromium/infra/config/swarming.star
+++ b/chromium/infra/config/swarming.star
@@ -118,6 +118,10 @@ swarming.pool_realm(
         "project-webrtc-ci-task-accounts",
         "project-webrtc-try-task-accounts",
 
+        # ... and Angle.
+        "project-angle-ci-task-accounts",
+        "project-angle-try-task-accounts",
+
         # Used by Pinpoint to trigger bisect jobs on machines in the Chrome-GPU pool.
         "service-account-chromeperf",
     ],
@@ -145,6 +149,8 @@ swarming.pool_realm(
     groups = [
         # Allow CI builders (mac-arm64-rel-tests) to trigger tests.
         "project-chromium-ci-task-accounts",
+        # V8 *CI* is using these Macs, too.
+        "project-v8-ci-task-accounts",
     ],
 )