BASELINE: Update Chromium to 88.0.4324.208

Change-Id: I3ae87d23e4eff4b4a469685658740a213600c667
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

58 files changed, 6203 insertions, 4765 deletions

diff --git a/chromium/infra/DIR_METADATA b/chromium/infra/DIR_METADATA
new file mode 100644
index 00000000000..d2d9af5936b
--- /dev/null
+++ b/chromium/infra/DIR_METADATA
@@ -0,0 +1,12 @@
+# 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/OWNERS b/chromium/infra/OWNERS
index 671ebec499f..ff71952806a 100644
--- a/chromium/infra/OWNERS
+++ b/chromium/infra/OWNERS
@@ -18,6 +18,3 @@ ynovikov@chromium.org
 
 # For code coverage and PGO related.
 liaoyuke@chromium.org
-
-# TEAM: infra-dev@chromium.org
-# COMPONENT: Infra>Client>Chrome
diff --git a/chromium/infra/config/DIR_METADATA b/chromium/infra/config/DIR_METADATA
new file mode 100644
index 00000000000..d2d9af5936b
--- /dev/null
+++ b/chromium/infra/config/DIR_METADATA
@@ -0,0 +1,12 @@
+# 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
deleted file mode 100644
index 525a006aff9..00000000000
--- a/chromium/infra/config/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# TEAM: infra-dev@chromium.org
-# COMPONENT: Infra>Client>Chrome
diff --git a/chromium/infra/config/PRESUBMIT.py b/chromium/infra/config/PRESUBMIT.py
index 3cd5940bbb5..ac53adcb072 100644
--- a/chromium/infra/config/PRESUBMIT.py
+++ b/chromium/infra/config/PRESUBMIT.py
@@ -49,3 +49,93 @@ def CheckLucicfgGenOutputDev(input_api, output_api):
 def CheckChangedLUCIConfigs(input_api, output_api):
   return input_api.canned_checks.CheckChangedLUCIConfigs(
       input_api, output_api)
+
+
+# Footer indicating a CL that is trying to address an outage by some mechanism
+# other than those in infra/config/outages
+_OUTAGE_ACTION_FOOTER = 'Infra-Config-Outage-Action'
+# Footer acknowledging that an outages configuration is in effect when making an
+# unrelated change
+_IGNORE_OUTAGE_FOOTER = 'Infra-Config-Ignore-Outage'
+
+def CheckOutagesConfigOnCommit(input_api, output_api):
+  outages_pyl = input_api.os_path.join(
+      input_api.PresubmitLocalPath(), 'generated/outages.pyl')
+  with open(outages_pyl) as f:
+    outages_config = input_api.ast.literal_eval(f.read())
+
+  if not outages_config:
+    footers = input_api.change.GitFootersFromDescription()
+    return [
+        output_api.PresubmitError(
+            'There is no outages configuration in effect, '
+            'please remove the {} footer from your CL description.'
+            .format(footer))
+        for footer in (_OUTAGE_ACTION_FOOTER, _IGNORE_OUTAGE_FOOTER)
+        if footer in footers
+    ]
+
+  # Any of the config files under infra/config/outages
+  outages_config_files = set()
+  # Any of the config files under infra/config/generated
+  generated_config_files = set()
+  # Any config files that are not under infra/config/outages or
+  # infra/config/generated
+  config_files = set()
+  for p in input_api.LocalPaths():
+    if p in ('README.md', 'OWNERS'):
+      continue
+    if p.startswith('infra/config/outages/'):
+      outages_config_files.add(p)
+      continue
+    if p.startswith('infra/config/generated/'):
+      generated_config_files.add(p)
+      continue
+    config_files.add(p)
+
+  # If the only changes to non-generated config fies were the outages files,
+  # assume the change was addressing an outage and that no additional mechanism
+  # needs to be added
+  if outages_config_files and not config_files:
+    # REVIEWER: Should we prevent the footers from being here in this case?
+    return []
+
+  # If any non-generated, non-outages files were modified or if the generated
+  # config files were modified without any config files being modified (lucicfg
+  # change, etc.) then make sure the user knows that when the outages
+  # configuration is disabled, the generated configuration may change
+  if config_files or generated_config_files:
+    footers = input_api.change.GitFootersFromDescription()
+
+    has_action_footer = _OUTAGE_ACTION_FOOTER in footers
+    has_ignore_footer = _IGNORE_OUTAGE_FOOTER in footers
+
+    if has_action_footer and has_ignore_footer:
+      return [
+          output_api.PresubmitError(
+              'Only one of {} or {} should be present in your CL description'
+              .format(_OUTAGE_ACTION_FOOTER, _IGNORE_OUTAGE_FOOTER)),
+      ]
+
+    if not has_action_footer and not has_ignore_footer:
+      outages_config_lines = ['{}: {}'.format(k, v)
+                              for k, v in sorted(outages_config.items())]
+      return [
+          output_api.PresubmitError('\n'.join([
+              'The following outages configuration is in effect:\n  {}'
+              .format('\n  '.join(outages_config_lines)),
+              ('The effect of your change may not be visible '
+               'in the generated configuration.'),
+              ('If your change is addressing the outage, '
+               'please add the footer {} with a link for the outage.')
+              .format(_OUTAGE_ACTION_FOOTER),
+              ('If your change is not addressing the outage '
+               'but you still wish to land it, please add the footer '
+               '{} with a reason.')
+              .format(_IGNORE_OUTAGE_FOOTER),
+              ('For more information on outages configuration, '
+               'see https://chromium.googlesource.com/chromium/src/+/refs/heads/master/infra/config/outages'),
+          ])),
+      ]
+
+  return []
diff --git a/chromium/infra/config/chromium-header.textpb b/chromium/infra/config/chromium-header.textpb
deleted file mode 100644
index e3b6a7a3bc7..00000000000
--- a/chromium/infra/config/chromium-header.textpb
+++ /dev/null
@@ -1,165 +0,0 @@
-oncalls {
-  name: "Chromium Branches"
-  url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-branch-sheriff"
-}
-oncalls {
-  name: "Trooper"
-  url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ops-client-infra"
-  show_primary_secondary_labels: true
-}
-links {
-  name: "Builds"
-  links {
-    text: "continuous"
-    url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
-    alt: "Continuous browser snapshots"
-  }
-  links {
-    text: "symbols"
-    url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
-    alt: "Windows Symbols"
-  }
-}
-links {
-  name: "Dashboards"
-  links {
-    text: "perf"
-    url: "https://chromeperf.appspot.com/"
-    alt: "Chrome perf dashboard"
-  }
-  links {
-    text: "flake-portal"
-    url: "https://analysis.chromium.org/p/chromium/flake-portal"
-    alt: "New flake portal"
-  }
-  links {
-    text: "legacy-flakiness"
-    url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
-    alt: "Legacy flakiness dashboard"
-  }
-}
-links {
-  name: "Chromium"
-  links {
-    text: "source"
-    url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280"
-    alt: "Chromium source code repository"
-  }
-  links {
-    text: "reviews"
-    url: "https://chromium-review.googlesource.com"
-    alt: "Chromium code review tool"
-  }
-  links {
-    text: "bugs"
-    url: "https://crbug.com"
-    alt: "Chromium bug tracker"
-  }
-  links {
-    text: "coverage"
-    url: "https://analysis.chromium.org/p/chromium/coverage"
-    alt: "Chromium code coverage dashboard"
-  }
-  links {
-    text: "dev"
-    url: "https://dev.chromium.org/Home"
-    alt: "Chromium developer home page"
-  }
-  links {
-    text: "support"
-    url: "https://support.google.com/chrome/#topic=7438008"
-    alt: "Google Chrome help center"
-  }
-}
-links {
-  name: "Consoles"
-  links {
-    text: "android"
-    url: "/p/chromium-m87/g/chromium.android"
-    alt: "Chromium Android console"
-  }
-  links {
-    text: "dawn"
-    url: "/p/chromium-m87/g/chromium.dawn"
-    alt: "Chromium Dawn console"
-  }
-  links {
-    text: "fyi"
-    url: "/p/chromium-m87/g/chromium.fyi"
-    alt: "Chromium FYI console"
-  }
-  links {
-    text: "gpu"
-    url: "/p/chromium-m87/g/chromium.gpu"
-    alt: "Chromium GPU console"
-  }
-  links {
-    text: "chromiumos"
-    url: "/p/chromium-m87/g/chromium.chromiumos"
-    alt: "ChromiumOS console"
-  }
-}
-links {
-  name: "Branch Consoles"
-  links {
-    text: "trunk"
-    url: "/p/chromium/g/main/console"
-    alt: "Trunk (ToT) console"
-  }
-}
-links {
-  name: "Tryservers"
-  links {
-    text: "android"
-    url: "/p/chromium-m87/g/tryserver.chromium.android/builders"
-    alt: "Android"
-  }
-  links {
-    text: "blink"
-    url: "/p/chromium-m87/g/tryserver.blink/builders"
-    alt: "Blink"
-  }
-  links {
-    text: "chromiumos"
-    url: "/p/chromium-m87/g/tryserver.chromium.chromiumos/builders"
-    alt: "ChromiumOS"
-  }
-  links {
-    text: "linux"
-    url: "/p/chromium-m87/g/tryserver.chromium.linux/builders"
-    alt: "Linux"
-  }
-  links {
-    text: "mac"
-    url: "/p/chromium-m87/g/tryserver.chromium.mac/builders"
-    alt: "Mac"
-  }
-  links {
-    text: "win"
-    url: "/p/chromium-m87/g/tryserver.chromium.win/builders"
-    alt: "Win"
-  }
-}
-links {
-  name: "Navigate"
-  links {
-    text: "about"
-    url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
-    alt: "Tour of the console"
-  }
-  links {
-    text: "customize"
-    url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280/infra/config/generated/luci-milo.cfg"
-    alt: "Customize this console"
-  }
-}
-console_groups {
-  console_ids: "chromium-m87/chromium"
-  console_ids: "chromium-m87/chromium.win"
-  console_ids: "chromium-m87/chromium.mac"
-  console_ids: "chromium-m87/chromium.linux"
-  console_ids: "chromium-m87/chromium.chromiumos"
-  console_ids: "chromium-m87/chromium.memory"
-  console_ids: "chromium-m87/chromium.gpu"
-  console_ids: "chromium-m87/chromium.android"
-}
diff --git a/chromium/infra/config/console-header.star b/chromium/infra/config/console-header.star
new file mode 100644
index 00000000000..89aa6b26567
--- /dev/null
+++ b/chromium/infra/config/console-header.star
@@ -0,0 +1,400 @@
+# Copyright 2020 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/branches.star", "branches")
+load(".//project.star", "ACTIVE_MILESTONES", "settings")
+
+def _remove_none(l):
+    return [e for e in l if e != None]
+
+def _remove_none_values(d):
+    return {k: v for k, v in d.items() if v != None}
+
+def _oncall(*, name, url, show_primary_secondary_labels = None, branch_selector = branches.MAIN):
+    if not branches.matches(branch_selector):
+        return None
+    return _remove_none_values(dict(
+        name = name,
+        url = url,
+        show_primary_secondary_labels = show_primary_secondary_labels,
+    ))
+
+def _link(*, url, text, alt, branch_selector = branches.MAIN):
+    if not branches.matches(branch_selector):
+        return None
+    return _remove_none_values(dict(
+        url = url,
+        text = text,
+        alt = alt,
+    ))
+
+def _link_group(*, name, links):
+    links = _remove_none(links)
+    if not links:
+        return None
+    return _remove_none_values(dict(
+        name = name,
+        links = links,
+    ))
+
+def _console_group_title(*, text, url):
+    return _remove_none_values(dict(
+        text = text,
+        url = url,
+    ))
+
+def _console_group(*, console_ids, title = None, branch_selector = branches.MAIN):
+    if not branches.matches(branch_selector):
+        return None
+    console_ids = _remove_none(console_ids)
+    if not console_ids:
+        return None
+    return _remove_none_values(dict(
+        title = title,
+        console_ids = console_ids,
+    ))
+
+def _header(*, oncalls, link_groups, console_groups, tree_status_host):
+    return _remove_none_values(dict(
+        oncalls = _remove_none(oncalls),
+        links = _remove_none(link_groups),
+        console_groups = _remove_none(console_groups),
+        tree_status_host = tree_status_host,
+    ))
+
+HEADER = _header(
+    oncalls = [
+        _oncall(
+            name = "Chromium",
+            url = "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff",
+        ),
+        _oncall(
+            name = "Chromium Branches",
+            branch_selector = branches.NOT_MAIN,
+            url = "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-branch-sheriff",
+        ),
+        _oncall(
+            name = "Android",
+            url = "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff",
+        ),
+        _oncall(
+            name = "iOS",
+            url = "https://rota-ng.appspot.com/legacy/sheriff_ios.json",
+        ),
+        _oncall(
+            name = "ChromeOS",
+            url = "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chromeos-gardeners",
+        ),
+        _oncall(
+            name = "GPU",
+            url = "https://chrome-ops-rotation-proxy.appspot.com/current/grotation:chrome-gpu-pixel-wrangling",
+        ),
+        _oncall(
+            name = "ANGLE",
+            url = "https://chrome-ops-rotation-proxy.appspot.com/current/grotation:angle-wrangler",
+        ),
+        _oncall(
+            name = "Perf",
+            url = "https://rota-ng.appspot.com/legacy/sheriff_perf.json",
+        ),
+        _oncall(
+            name = "Perfbot",
+            url = "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json",
+        ),
+        _oncall(
+            name = "Trooper",
+            branch_selector = branches.ALL_BRANCHES,
+            url = "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ops-client-infra",
+            show_primary_secondary_labels = True,
+        ),
+    ],
+    link_groups = [
+        _link_group(
+            name = "Builds",
+            links = [
+                _link(
+                    text = "continuous",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html",
+                    alt = "Continuous browser snapshots",
+                ),
+                _link(
+                    text = "symbols",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "https://www.chromium.org/developers/how-tos/debugging-on-windows",
+                    alt = "Windows Symbols",
+                ),
+                _link(
+                    text = "status",
+                    url = "https://chromium-status.appspot.com/",
+                    alt = "Current tree status",
+                ),
+            ],
+        ),
+        _link_group(
+            name = "Dashboards",
+            links = [
+                _link(
+                    text = "perf",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "https://chromeperf.appspot.com/",
+                    alt = "Chrome perf dashboard",
+                ),
+                _link(
+                    text = "flake-portal",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "https://analysis.chromium.org/p/chromium/flake-portal",
+                    alt = "New flake portal",
+                ),
+                _link(
+                    text = "legacy-flakiness",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "https://test-results.appspot.com/dashboards/flakiness_dashboard.html",
+                    alt = "Legacy flakiness dashboard",
+                ),
+            ],
+        ),
+        _link_group(
+            name = "Chromium",
+            links = [
+                _link(
+                    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),
+                    ),
+                    alt = "Chromium source code repository",
+                ),
+                _link(
+                    text = "reviews",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "https://chromium-review.googlesource.com",
+                    alt = "Chromium code review tool",
+                ),
+                _link(
+                    text = "bugs",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "https://crbug.com",
+                    alt = "Chromium bug tracker",
+                ),
+                _link(
+                    text = "coverage",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "https://analysis.chromium.org/p/chromium/coverage",
+                    alt = "Chromium code coverage dashboard",
+                ),
+                _link(
+                    text = "dev",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "https://dev.chromium.org/Home",
+                    alt = "Chromium developer home page",
+                ),
+                _link(
+                    text = "support",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "https://support.google.com/chrome/#topic=7438008",
+                    alt = "Google Chrome help center",
+                ),
+            ],
+        ),
+        _link_group(
+            name = "Consoles",
+            links = [
+                _link(
+                    text = "android",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "/p/{}/g/chromium.android".format(settings.project),
+                    alt = "Chromium Android console",
+                ),
+                _link(
+                    text = "clang",
+                    url = "/p/{}/g/chromium.clang".format(settings.project),
+                    alt = "Chromium Clang console",
+                ),
+                _link(
+                    text = "dawn",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "/p/{}/g/chromium.dawn".format(settings.project),
+                    alt = "Chromium Dawn console",
+                ),
+                _link(
+                    text = "fuzz",
+                    url = "/p/{}/g/chromium.fuzz".format(settings.project),
+                    alt = "Chromium Fuzz console",
+                ),
+                _link(
+                    text = "fyi",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "/p/{}/g/chromium.fyi".format(settings.project),
+                    alt = "Chromium FYI console",
+                ),
+                _link(
+                    text = "gpu",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "/p/{}/g/chromium.gpu".format(settings.project),
+                    alt = "Chromium GPU console",
+                ),
+                _link(
+                    text = "perf",
+                    url = "/p/chrome/g/chrome.perf/console",
+                    alt = "Chromium Perf console",
+                ),
+                _link(
+                    text = "perf.fyi",
+                    url = "/p/chrome/g/chrome.perf.fyi/console",
+                    alt = "Chromium Perf FYI console",
+                ),
+                _link(
+                    text = "swangle",
+                    url = "/p/{}/g/chromium.swangle".format(settings.project),
+                    alt = "Chromium SWANGLE console",
+                ),
+                _link(
+                    text = "webrtc",
+                    url = "/p/{}/g/chromium.webrtc".format(settings.project),
+                    alt = "Chromium WebRTC console",
+                ),
+                _link(
+                    text = "chromiumos",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "/p/{}/g/chromium.chromiumos".format(settings.project),
+                    alt = "ChromiumOS console",
+                ),
+            ],
+        ),
+        _link_group(
+            name = "Branch Consoles",
+            links = [
+                _link(
+                    text = milestone,
+                    url = "/p/{}/g/main/console".format(details.project),
+                    alt = "{} branch console".format(details.channel),
+                )
+                for milestone, details in sorted(ACTIVE_MILESTONES.items())
+            ] + [
+                _link(
+                    text = "trunk",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "/p/chromium/g/main/console",
+                    alt = "Trunk (ToT) console",
+                ),
+            ],
+        ),
+        _link_group(
+            name = "Tryservers",
+            links = [
+                _link(
+                    text = "android",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "/p/{}/g/tryserver.chromium.android/builders".format(settings.project),
+                    alt = "Android",
+                ),
+                _link(
+                    text = "angle",
+                    url = "/p/{}/g/tryserver.chromium.angle/builders".format(settings.project),
+                    alt = "Angle",
+                ),
+                _link(
+                    text = "blink",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "/p/{}/g/tryserver.blink/builders".format(settings.project),
+                    alt = "Blink",
+                ),
+                _link(
+                    text = "chrome",
+                    url = "/p/chrome/g/tryserver.chrome/builders",
+                    alt = "Chrome",
+                ),
+                _link(
+                    text = "chromiumos",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "/p/{}/g/tryserver.chromium.chromiumos/builders".format(settings.project),
+                    alt = "ChromiumOS",
+                ),
+                _link(
+                    text = "linux",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "/p/{}/g/tryserver.chromium.linux/builders".format(settings.project),
+                    alt = "Linux",
+                ),
+                _link(
+                    text = "mac",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "/p/{}/g/tryserver.chromium.mac/builders".format(settings.project),
+                    alt = "Mac",
+                ),
+                _link(
+                    text = "swangle",
+                    url = "/p/{}/g/tryserver.chromium.swangle/builders".format(settings.project),
+                    alt = "SWANGLE",
+                ),
+                _link(
+                    text = "win",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "/p/{}/g/tryserver.chromium.win/builders".format(settings.project),
+                    alt = "Win",
+                ),
+            ],
+        ),
+        _link_group(
+            name = "Navigate",
+            links = [
+                _link(
+                    text = "about",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot",
+                    alt = "Tour of the console",
+                ),
+                _link(
+                    text = "customize",
+                    branch_selector = branches.ALL_BRANCHES,
+                    url = "https://chromium.googlesource.com/chromium/src/+/{}/infra/config/generated/luci-milo.cfg".format(settings.ref),
+                    alt = "Customize this console",
+                ),
+            ],
+        ),
+    ],
+    console_groups = [
+        _console_group(
+            title = _console_group_title(
+                text = "Tree Closers",
+                url = "https://chromium-status.appspot.com/",
+            ),
+            console_ids = [
+                "chromium/chromium",
+                "chromium/chromium.win",
+                "chromium/chromium.mac",
+                "chromium/chromium.linux",
+                "chromium/chromium.chromiumos",
+                "chrome/chrome",
+                "chromium/chromium.memory",
+                "chromium/chromium.gpu",
+            ],
+        ),
+        _console_group(
+            console_ids = [
+                "chromium/chromium.android",
+                "chrome/chrome.perf",
+                "chromium/chromium.gpu.fyi",
+                "chromium/chromium.swangle",
+                "chromium/chromium.fuzz",
+            ],
+        ),
+        _console_group(
+            branch_selector = branches.NOT_MAIN,
+            console_ids = ["{}/{}".format(settings.project, c) for c in [
+                "chromium",
+                "chromium.win",
+                "chromium.mac",
+                "chromium.linux",
+                "chromium.chromiumos",
+                "chromium.memory",
+                "chromium.gpu",
+                "chromium.android",
+            ]],
+        ),
+    ],
+    tree_status_host = settings.tree_status_host,
+)
diff --git a/chromium/infra/config/dev/dev.star b/chromium/infra/config/dev/dev.star
index 51e9f51dc47..d514e1c7fa9 100755
--- a/chromium/infra/config/dev/dev.star
+++ b/chromium/infra/config/dev/dev.star
@@ -54,6 +54,9 @@ luci.realm(
     ],
 )
 
+# Launch Swarming tasks in "realms-aware mode", crbug.com/1136313.
+luci.builder.defaults.experiments.set({"luci.use_realms": 100})
+
 exec("//dev/swarming.star")
 
 exec("//dev/subprojects/chromium/subproject.star")
diff --git a/chromium/infra/config/dev/subprojects/chromium/ci.star b/chromium/infra/config/dev/subprojects/chromium/ci.star
index 403e0fdb683..2cad54a03e3 100644
--- a/chromium/infra/config/dev/subprojects/chromium/ci.star
+++ b/chromium/infra/config/dev/subprojects/chromium/ci.star
@@ -26,7 +26,7 @@ luci.bucket(
 )
 
 luci.gitiles_poller(
-    name = "master-gitiles-trigger",
+    name = "chromium-gitiles-trigger",
     bucket = "ci",
     repo = "https://chromium.googlesource.com/chromium/src",
 )
@@ -51,7 +51,7 @@ defaults.swarming_tags.set(["vpython:native-python-wrapper"])
 def ci_builder(*, name, **kwargs):
     return builder(
         name = name,
-        triggered_by = ["master-gitiles-trigger"],
+        triggered_by = ["chromium-gitiles-trigger"],
         resultdb_bigquery_exports = [resultdb.export_test_results(
             bq_table = "luci-resultdb-dev.chromium.ci_test_results",
         )],
diff --git a/chromium/infra/config/generated/commit-queue.cfg b/chromium/infra/config/generated/commit-queue.cfg
index f6b575f7a49..8b51897feeb 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/4280"
+      ref_regexp: "refs/branch-heads/4324"
     }
   }
   verifiers {
@@ -75,13 +75,13 @@ config_groups {
         owner_whitelist_group: "project-chromium-robot-committers"
       }
       builders {
-        name: "chromium-m87/try/android-binary-size"
+        name: "chromium-m88/try/android-binary-size"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/android-cronet-arm-dbg"
+        name: "chromium-m88/try/android-cronet-arm-dbg"
         location_regexp: ".+/[+]/components/cronet/.+"
         location_regexp: ".+/[+]/components/grpc_support/.+"
         location_regexp: ".+/[+]/build/android/.+"
@@ -91,30 +91,30 @@ config_groups {
         location_regexp_exclude: ".+/[+]/components/cronet/ios/.+"
       }
       builders {
-        name: "chromium-m87/try/android-lollipop-arm-rel"
+        name: "chromium-m88/try/android-lollipop-arm-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/android-marshmallow-arm64-rel"
+        name: "chromium-m88/try/android-marshmallow-arm64-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/android-marshmallow-x86-rel"
-        experiment_percentage: 20
+        name: "chromium-m88/try/android-marshmallow-x86-rel"
+        experiment_percentage: 100
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/android-official"
+        name: "chromium-m88/try/android-official"
         includable_only: true
       }
       builders {
-        name: "chromium-m87/try/android-pie-arm64-dbg"
+        name: "chromium-m88/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/.+"
@@ -129,20 +129,19 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/android-pie-arm64-rel"
-        experiment_percentage: 60
+        name: "chromium-m88/try/android-pie-arm64-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/android_compile_dbg"
+        name: "chromium-m88/try/android_compile_dbg"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/android_compile_x64_dbg"
+        name: "chromium-m88/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/.+"
@@ -155,7 +154,7 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/android_compile_x86_dbg"
+        name: "chromium-m88/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/.+"
@@ -168,13 +167,13 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/android_cronet"
+        name: "chromium-m88/try/android_cronet"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/android_optional_gpu_tests_rel"
+        name: "chromium-m88/try/android_optional_gpu_tests_rel"
         location_regexp: ".+/[+]/cc/.+"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
@@ -195,38 +194,38 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/cast_shell_android"
+        name: "chromium-m88/try/cast_shell_android"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/cast_shell_linux"
+        name: "chromium-m88/try/cast_shell_linux"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/chromeos-amd64-generic-dbg"
+        name: "chromium-m88/try/chromeos-amd64-generic-dbg"
         location_regexp: ".+/[+]/content/gpu/.+"
         location_regexp: ".+/[+]/media/.+"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/chromeos-amd64-generic-rel"
+        name: "chromium-m88/try/chromeos-amd64-generic-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/chromeos-arm-generic-rel"
+        name: "chromium-m88/try/chromeos-arm-generic-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/chromeos-kevin-rel"
+        name: "chromium-m88/try/chromeos-kevin-rel"
         location_regexp: ".+/[+]/build/chromeos/.+"
         location_regexp: ".+/[+]/build/config/chromeos/.*"
         location_regexp: ".+/[+]/chromeos/CHROMEOS_LKGM"
@@ -234,17 +233,11 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/chromium_presubmit"
+        name: "chromium-m88/try/chromium_presubmit"
         disable_reuse: true
       }
       builders {
-        name: "chromium-m87/try/closure_compilation"
-        location_regexp: ".+/[+]/third_party/closure_compiler/.+"
-        location_regexp_exclude: ".+/[+]/docs/.+"
-        location_regexp_exclude: ".+/[+]/infra/config/.+"
-      }
-      builders {
-        name: "chromium-m87/try/dawn-linux-x64-deps-rel"
+        name: "chromium-m88/try/dawn-linux-x64-deps-rel"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
@@ -258,7 +251,7 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/dawn-mac-x64-deps-rel"
+        name: "chromium-m88/try/dawn-mac-x64-deps-rel"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
@@ -272,7 +265,7 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/dawn-win10-x64-deps-rel"
+        name: "chromium-m88/try/dawn-win10-x64-deps-rel"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
@@ -286,7 +279,7 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/dawn-win10-x86-deps-rel"
+        name: "chromium-m88/try/dawn-win10-x86-deps-rel"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
@@ -300,41 +293,41 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/fuchsia-arm64-cast"
+        name: "chromium-m88/try/fuchsia-arm64-cast"
         location_regexp: ".+/[+]/chromecast/.+"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/fuchsia-official"
+        name: "chromium-m88/try/fuchsia-official"
         includable_only: true
       }
       builders {
-        name: "chromium-m87/try/fuchsia-x64-cast"
+        name: "chromium-m88/try/fuchsia-x64-cast"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/fuchsia_arm64"
+        name: "chromium-m88/try/fuchsia_arm64"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/fuchsia_x64"
+        name: "chromium-m88/try/fuchsia_x64"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/ios-simulator"
+        name: "chromium-m88/try/ios-simulator"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/ios-simulator-cronet"
+        name: "chromium-m88/try/ios-simulator-cronet"
         location_regexp: ".+/[+]/components/cronet/.+"
         location_regexp: ".+/[+]/components/grpc_support/.+"
         location_regexp: ".+/[+]/ios/.+"
@@ -343,13 +336,13 @@ config_groups {
         location_regexp_exclude: ".+/[+]/components/cronet/android/.+"
       }
       builders {
-        name: "chromium-m87/try/ios-simulator-full-configs"
+        name: "chromium-m88/try/ios-simulator-full-configs"
         location_regexp: ".+/[+]/ios/.+"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/linux-blink-rel"
+        name: "chromium-m88/try/linux-blink-rel"
         location_regexp: ".+/[+]/cc/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/paint/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/svg/.+"
@@ -358,66 +351,65 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/linux-chromeos-compile-dbg"
+        name: "chromium-m88/try/linux-chromeos-compile-dbg"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/linux-chromeos-rel"
-        cancel_stale: NO
+        name: "chromium-m88/try/linux-chromeos-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/linux-libfuzzer-asan-rel"
+        name: "chromium-m88/try/linux-libfuzzer-asan-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/linux-official"
+        name: "chromium-m88/try/linux-official"
         includable_only: true
       }
       builders {
-        name: "chromium-m87/try/linux-ozone-rel"
+        name: "chromium-m88/try/linux-ozone-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/linux-rel"
+        name: "chromium-m88/try/linux-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/linux_chromium_asan_rel_ng"
+        name: "chromium-m88/try/linux_chromium_asan_rel_ng"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/linux_chromium_compile_dbg_ng"
+        name: "chromium-m88/try/linux_chromium_compile_dbg_ng"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/linux_chromium_dbg_ng"
+        name: "chromium-m88/try/linux_chromium_dbg_ng"
         location_regexp: ".+/[+]/build/.*check_gn_headers.*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/linux_chromium_tsan_rel_ng"
+        name: "chromium-m88/try/linux_chromium_tsan_rel_ng"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/linux_layout_tests_composite_after_paint"
+        name: "chromium-m88/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/.+"
@@ -426,7 +418,7 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/linux_layout_tests_layout_ng_disabled"
+        name: "chromium-m88/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/.+"
@@ -439,7 +431,7 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/linux_optional_gpu_tests_rel"
+        name: "chromium-m88/try/linux_optional_gpu_tests_rel"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
         location_regexp: ".+/[+]/content/test/gpu/.+"
@@ -458,35 +450,35 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/linux_vr"
+        name: "chromium-m88/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-m87/try/mac-arm64-rel"
+        name: "chromium-m88/try/mac-arm64-rel"
         includable_only: true
       }
       builders {
-        name: "chromium-m87/try/mac-official"
+        name: "chromium-m88/try/mac-official"
         includable_only: true
       }
       builders {
-        name: "chromium-m87/try/mac-rel"
+        name: "chromium-m88/try/mac-rel"
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/mac_chromium_compile_dbg_ng"
+        name: "chromium-m88/try/mac_chromium_compile_dbg_ng"
         cancel_stale: NO
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/mac_optional_gpu_tests_rel"
+        name: "chromium-m88/try/mac_optional_gpu_tests_rel"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
         location_regexp: ".+/[+]/content/test/gpu/.+"
@@ -506,42 +498,42 @@ config_groups {
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/win-libfuzzer-asan-rel"
+        name: "chromium-m88/try/win-libfuzzer-asan-rel"
         cancel_stale: NO
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/win-official"
+        name: "chromium-m88/try/win-official"
         includable_only: true
       }
       builders {
-        name: "chromium-m87/try/win10_chromium_x64_rel_ng"
+        name: "chromium-m88/try/win10_chromium_x64_rel_ng"
         cancel_stale: NO
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/win32-official"
+        name: "chromium-m88/try/win32-official"
         includable_only: true
       }
       builders {
-        name: "chromium-m87/try/win7-rel"
+        name: "chromium-m88/try/win7-rel"
         location_regexp: ".+/[+]/sandbox/win/.+"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/win_chromium_compile_dbg_ng"
+        name: "chromium-m88/try/win_chromium_compile_dbg_ng"
         cancel_stale: NO
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
       builders {
-        name: "chromium-m87/try/win_optional_gpu_tests_rel"
+        name: "chromium-m88/try/win_optional_gpu_tests_rel"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
         location_regexp: ".+/[+]/content/test/gpu/.+"
diff --git a/chromium/infra/config/generated/cr-buildbucket.cfg b/chromium/infra/config/generated/cr-buildbucket.cfg
index 0579671dc7e..73d20210744 100644
--- a/chromium/infra/config/generated/cr-buildbucket.cfg
+++ b/chromium/infra/config/generated/cr-buildbucket.cfg
@@ -33,11 +33,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -49,6 +53,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -66,11 +80,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -82,6 +100,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -99,11 +127,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -115,6 +147,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -132,11 +174,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -148,6 +194,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -165,11 +221,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -181,6 +241,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -198,11 +268,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -214,6 +288,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -231,11 +315,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -247,6 +335,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -264,11 +362,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -280,6 +382,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -297,11 +409,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -313,6 +429,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -330,11 +456,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -346,6 +476,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -363,11 +503,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -379,6 +523,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -396,11 +550,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -412,6 +570,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -429,11 +597,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -445,6 +617,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -462,11 +644,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -478,6 +664,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -493,11 +689,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -509,6 +709,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -526,11 +736,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -542,6 +756,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -559,11 +783,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -575,6 +803,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -592,11 +830,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -608,6 +850,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -625,11 +877,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -641,6 +897,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -658,11 +924,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -674,6 +944,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -691,11 +971,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -707,6 +991,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -724,11 +1018,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -740,6 +1038,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -757,11 +1065,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -773,6 +1085,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -790,11 +1112,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -806,6 +1132,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -823,11 +1159,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -839,6 +1179,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -856,11 +1206,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -872,6 +1226,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -887,11 +1251,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -903,6 +1271,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -920,11 +1298,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -936,6 +1318,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -953,11 +1345,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -969,6 +1365,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -986,11 +1392,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1002,6 +1412,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1019,11 +1439,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1035,6 +1459,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1052,11 +1486,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1068,6 +1506,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1085,11 +1533,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1101,6 +1553,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1118,11 +1580,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1134,6 +1600,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1151,11 +1627,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1167,6 +1647,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1184,11 +1674,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1200,6 +1694,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1217,11 +1721,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1233,6 +1741,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1250,11 +1768,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1266,6 +1788,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1283,11 +1815,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1299,6 +1835,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1316,11 +1862,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1332,6 +1882,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1349,11 +1909,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1365,6 +1929,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1382,11 +1956,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1398,6 +1976,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1415,11 +2003,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1431,6 +2023,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1448,11 +2050,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1464,6 +2070,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1479,11 +2095,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1495,6 +2115,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1510,11 +2140,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1526,6 +2160,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1543,11 +2187,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1559,6 +2207,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1576,11 +2234,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1592,38 +2254,15 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
-      }
-    }
-    builders {
-      name: "Mac10.10 Tests"
-      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-16.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: "recipes"
-      }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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\"}"
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
         bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
         }
       }
     }
@@ -1642,11 +2281,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1658,6 +2301,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1675,11 +2328,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1691,6 +2348,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1708,11 +2375,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1724,6 +2395,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1741,11 +2422,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1757,6 +2442,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1774,11 +2469,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1790,6 +2489,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1807,11 +2516,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1823,6 +2536,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1840,11 +2563,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1856,6 +2583,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1873,11 +2610,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1889,6 +2630,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1906,11 +2657,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1922,6 +2677,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1939,11 +2704,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 36000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1955,6 +2724,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -1971,11 +2750,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -1987,6 +2770,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2003,11 +2796,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2019,6 +2816,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2035,11 +2842,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2051,6 +2862,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2065,13 +2886,17 @@ buckets {
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        cmd: "recipes"
+        cmd: "luciexe"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2083,6 +2908,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2100,11 +2935,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2116,6 +2955,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2132,11 +2981,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2148,6 +3001,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2165,11 +3028,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2181,6 +3048,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2198,11 +3075,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2214,6 +3095,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2231,11 +3122,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2247,6 +3142,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2264,11 +3169,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2280,6 +3189,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2297,11 +3216,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2313,6 +3236,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2330,11 +3263,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2346,6 +3283,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2363,11 +3310,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2379,6 +3330,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2396,11 +3357,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2412,6 +3377,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2429,11 +3404,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2445,6 +3424,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2462,11 +3451,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2478,6 +3471,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2495,11 +3498,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2511,6 +3518,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2528,11 +3545,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2544,6 +3565,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2561,11 +3592,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2577,6 +3612,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2594,11 +3639,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2610,6 +3659,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2627,11 +3686,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2643,6 +3706,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2660,11 +3733,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2676,6 +3753,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2693,11 +3780,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2709,6 +3800,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2726,11 +3827,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 36000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2742,6 +3847,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2759,11 +3874,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2775,6 +3894,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2790,7 +3919,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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\":\"12a7209\"}"
+      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m88\"}},\"$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\":\"12a7209\"}"
       execution_timeout_secs: 10800
       caches {
         name: "xcode_ios_12a7209"
@@ -2799,6 +3928,10 @@ buckets {
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2810,6 +3943,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2825,7 +3968,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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\":\"11e146\"}"
+      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m88\"}},\"$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\":\"11e146\"}"
       execution_timeout_secs: 36000
       caches {
         name: "xcode_ios_11e146"
@@ -2834,6 +3977,10 @@ buckets {
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2845,6 +3992,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2860,7 +4017,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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\":\"12a7209\"}"
+      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m88\"}},\"$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\":\"12a7209\"}"
       execution_timeout_secs: 10800
       caches {
         name: "xcode_ios_12a7209"
@@ -2869,6 +4026,10 @@ buckets {
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2880,6 +4041,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2897,11 +4068,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2913,6 +4088,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2930,11 +4115,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2946,6 +4135,110 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+      }
+    }
+    builders {
+      name: "linux-lacros-builder-rel"
+      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-16.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: "recipes"
+      }
+      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m88\"}},\"$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\"}"
+      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: 50
+      }
+      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: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+      }
+    }
+    builders {
+      name: "linux-lacros-tester-rel"
+      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-16.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: "recipes"
+      }
+      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m88\"}},\"$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\"}"
+      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: 50
+      }
+      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: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2962,11 +4255,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 36000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -2978,6 +4275,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -2995,11 +4302,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3011,6 +4322,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3026,11 +4347,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       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: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3042,6 +4367,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3058,11 +4393,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 21600
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3074,6 +4413,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3090,11 +4439,15 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m87\"}},\"$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-m88\"}},\"$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\"}"
       execution_timeout_secs: 21600
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3106,6 +4459,16 @@ buckets {
           table: "ci_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
   }
@@ -3155,7 +4518,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/binary_size\":{\"analyze_targets\":[\"//chrome/android:validate_expectations\",\"//chrome/android:monochrome_public_minimal_apks\",\"//tools/binary_size:binary_size_trybot_py\"],\"compile_targets\":[\"monochrome_public_minimal_apks\",\"monochrome_static_initializers\",\"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\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"binary_size_trybot\"}"
       execution_timeout_secs: 14400
       expiration_secs: 7200
       caches {
@@ -3168,6 +4531,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3179,6 +4546,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3209,6 +4586,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3220,6 +4601,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3250,6 +4641,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3261,6 +4656,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3291,6 +4696,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3302,6 +4711,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3332,6 +4751,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3343,6 +4766,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3373,6 +4806,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3384,6 +4821,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3414,6 +4861,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3425,6 +4876,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3455,6 +4916,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3466,6 +4931,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3496,6 +4971,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3507,6 +4986,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3537,6 +5026,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3548,6 +5041,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3578,6 +5081,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3589,6 +5096,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3619,6 +5136,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3630,6 +5151,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3659,6 +5190,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3670,6 +5205,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3700,6 +5245,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3711,6 +5260,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3741,6 +5300,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3752,6 +5315,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3782,6 +5355,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3793,6 +5370,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3823,6 +5410,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3834,6 +5425,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3864,6 +5465,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3875,6 +5480,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3905,6 +5520,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3916,6 +5535,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -3934,6 +5563,7 @@ buckets {
         cmd: "recipes"
       }
       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\"}"
+      priority: 25
       execution_timeout_secs: 14400
       expiration_secs: 7200
       caches {
@@ -3946,6 +5576,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -3957,46 +5591,15 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
-      }
-    }
-    builders {
-      name: "closure_compilation"
-      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-16.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: "recipes"
-      }
-      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\":\"closure_compilation\"}"
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      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: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
         bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
         }
       }
     }
@@ -4026,6 +5629,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4037,6 +5644,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4065,6 +5682,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4076,6 +5697,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4104,6 +5735,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4115,6 +5750,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4143,6 +5788,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4154,6 +5803,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4184,6 +5843,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4195,6 +5858,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4225,6 +5898,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4236,6 +5913,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4266,6 +5953,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4277,6 +5968,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4307,6 +6008,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4318,6 +6023,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4348,6 +6063,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4359,6 +6078,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4391,6 +6120,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4402,6 +6135,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4434,6 +6177,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4445,6 +6192,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4477,6 +6234,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4488,6 +6249,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4518,6 +6289,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4529,6 +6304,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4559,6 +6344,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4570,6 +6359,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4600,6 +6399,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4611,6 +6414,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4641,6 +6454,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4652,6 +6469,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4682,6 +6509,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4693,6 +6524,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4723,6 +6564,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4734,6 +6579,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4764,6 +6619,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4775,6 +6634,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4805,6 +6674,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4816,6 +6689,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4850,6 +6733,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4861,6 +6748,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4895,6 +6792,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4906,6 +6807,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4936,6 +6847,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4947,6 +6862,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -4977,6 +6902,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -4988,6 +6917,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5018,6 +6957,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5029,6 +6972,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5058,6 +7011,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5069,6 +7026,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5099,6 +7066,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5110,6 +7081,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5139,6 +7120,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5150,6 +7135,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5178,6 +7173,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5189,6 +7188,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5197,7 +7206,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {
@@ -5218,6 +7227,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5229,6 +7242,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5237,7 +7260,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {
@@ -5258,6 +7281,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5269,6 +7296,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5297,6 +7334,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5308,6 +7349,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5337,6 +7388,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5348,6 +7403,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5378,6 +7443,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5389,6 +7458,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5419,6 +7498,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5430,6 +7513,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5460,6 +7553,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5471,6 +7568,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5501,6 +7608,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5512,6 +7623,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5542,6 +7663,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5553,6 +7678,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
       }
     }
     builders {
@@ -5583,6 +7718,10 @@ buckets {
         value: 5
       }
       experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
         key: "luci.use_realms"
         value: 100
       }
@@ -5594,6 +7733,16 @@ buckets {
           table: "try_test_results"
           test_results {}
         }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              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 d068e647f06..1d37a2b2c4f 100644
--- a/chromium/infra/config/generated/luci-milo.cfg
+++ b/chromium/infra/config/generated/luci-milo.cfg
@@ -6,467 +6,472 @@
 
 consoles {
   id: "main"
-  name: "Chromium M87 Main Console"
+  name: "Chromium M88 Main Console"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4280"
+  refs: "regexp:refs/branch-heads/4324"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-official"
+    name: "buildbucket/luci.chromium-m88.ci/android-official"
     category: "chromium|android"
     short_name: "off"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/fuchsia-official"
+    name: "buildbucket/luci.chromium-m88.ci/fuchsia-official"
     category: "chromium|fuchsia"
     short_name: "off"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/win32-official"
+    name: "buildbucket/luci.chromium-m88.ci/win32-official"
     category: "chromium|win|off"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/win-official"
+    name: "buildbucket/luci.chromium-m88.ci/win-official"
     category: "chromium|win|off"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win x64 Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Win x64 Builder"
     category: "chromium.win|release|builder"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win 7 Tests x64 (1)"
+    name: "buildbucket/luci.chromium-m88.ci/Win 7 Tests x64 (1)"
     category: "chromium.win|release|tester"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win10 Tests x64"
+    name: "buildbucket/luci.chromium-m88.ci/Win10 Tests x64"
     category: "chromium.win|release|tester"
     short_name: "w10"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Win Builder (dbg)"
     category: "chromium.win|debug|builder"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win7 Tests (dbg)(1)"
+    name: "buildbucket/luci.chromium-m88.ci/Win7 Tests (dbg)(1)"
     category: "chromium.win|debug|tester"
     short_name: "7"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Mac Builder"
     category: "chromium.mac|release"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.10 Tests"
-    category: "chromium.mac|release"
-    short_name: "10"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.11 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.11 Tests"
     category: "chromium.mac|release"
     short_name: "11"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.12 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.12 Tests"
     category: "chromium.mac|release"
     short_name: "12"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.13 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.13 Tests"
     category: "chromium.mac|release"
     short_name: "13"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.14 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.14 Tests"
     category: "chromium.mac|release"
     short_name: "14"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.15 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.15 Tests"
     category: "chromium.mac|release"
     short_name: "15"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/mac-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.ci/mac-arm64-rel"
     category: "chromium.mac|release|arm64"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Mac Builder (dbg)"
     category: "chromium.mac|debug"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.13 Tests (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.13 Tests (dbg)"
     category: "chromium.mac|debug"
     short_name: "13"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/ios-simulator"
+    name: "buildbucket/luci.chromium-m88.ci/ios-simulator"
     category: "chromium.mac|ios|default"
     short_name: "sim"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/ios-simulator-full-configs"
+    name: "buildbucket/luci.chromium-m88.ci/ios-simulator-full-configs"
     category: "chromium.mac|ios|default"
     short_name: "ful"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Builder"
     category: "chromium.linux|release"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tests"
     category: "chromium.linux|release"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/linux-ozone-rel"
+    name: "buildbucket/luci.chromium-m88.ci/linux-ozone-rel"
     category: "chromium.linux|release"
     short_name: "ozo"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tester (Ozone Headless)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tester (Ozone Headless)"
     category: "chromium.linux|release|ozone"
     short_name: "ltoh"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tester (Ozone Wayland)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tester (Ozone Wayland)"
     category: "chromium.linux|release|ozone"
     short_name: "ltow"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tester (Ozone X11)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tester (Ozone X11)"
     category: "chromium.linux|release|ozone"
     short_name: "ltox"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Builder (dbg)"
     category: "chromium.linux|debug|builder"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tests (dbg)(1)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tests (dbg)(1)"
     category: "chromium.linux|debug|tester"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Cast Linux"
+    name: "buildbucket/luci.chromium-m88.ci/Cast Linux"
     category: "chromium.linux|cast"
     short_name: "vid"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Fuchsia ARM64"
+    name: "buildbucket/luci.chromium-m88.ci/Fuchsia ARM64"
     category: "chromium.linux|fuchsia|a64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/fuchsia-arm64-cast"
+    name: "buildbucket/luci.chromium-m88.ci/fuchsia-arm64-cast"
     category: "chromium.linux|fuchsia|cast"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/fuchsia-x64-cast"
+    name: "buildbucket/luci.chromium-m88.ci/fuchsia-x64-cast"
     category: "chromium.linux|fuchsia|cast"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Fuchsia x64"
+    name: "buildbucket/luci.chromium-m88.ci/Fuchsia x64"
     category: "chromium.linux|fuchsia|x64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/linux-chromeos-rel"
+    name: "buildbucket/luci.chromium-m88.ci/linux-chromeos-rel"
     category: "chromium.chromiumos|default"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/linux-chromeos-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/linux-chromeos-dbg"
     category: "chromium.chromiumos|default"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/chromeos-amd64-generic-lacros-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/linux-lacros-builder-rel"
+    category: "chromium.chromiumos|default"
+    short_name: "lcr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m88.ci/linux-lacros-tester-rel"
+    category: "chromium.chromiumos|default"
+    short_name: "lcr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m88.ci/chromeos-amd64-generic-lacros-dbg"
     category: "chromium.chromiumos|lacros|x64"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/chromeos-arm-generic-rel"
+    name: "buildbucket/luci.chromium-m88.ci/chromeos-arm-generic-rel"
     category: "chromium.chromiumos|simple|release"
     short_name: "arm"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/chromeos-kevin-rel"
+    name: "buildbucket/luci.chromium-m88.ci/chromeos-kevin-rel"
     category: "chromium.chromiumos|simple|release"
     short_name: "kvn"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/chromeos-amd64-generic-rel"
+    name: "buildbucket/luci.chromium-m88.ci/chromeos-amd64-generic-rel"
     category: "chromium.chromiumos|simple|release|x64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/chromeos-amd64-generic-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/chromeos-amd64-generic-dbg"
     category: "chromium.chromiumos|simple|debug|x64"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-cronet-arm-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/android-cronet-arm-dbg"
     category: "chromium.android|cronet|arm"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-cronet-arm-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-cronet-arm-rel"
     category: "chromium.android|cronet|arm"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-cronet-arm-rel-kitkat-tests"
+    name: "buildbucket/luci.chromium-m88.ci/android-cronet-arm-rel-kitkat-tests"
     category: "chromium.android|cronet|test"
     short_name: "k"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-cronet-arm-rel-lollipop-tests"
+    name: "buildbucket/luci.chromium-m88.ci/android-cronet-arm-rel-lollipop-tests"
     category: "chromium.android|cronet|test"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android arm Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android arm Builder (dbg)"
     category: "chromium.android|builder|arm"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android arm64 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android arm64 Builder (dbg)"
     category: "chromium.android|builder|arm"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android x86 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android x86 Builder (dbg)"
     category: "chromium.android|builder|x86"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android x64 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android x64 Builder (dbg)"
     category: "chromium.android|builder|x86"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Marshmallow 64 bit Tester"
+    name: "buildbucket/luci.chromium-m88.ci/Marshmallow 64 bit Tester"
     category: "chromium.android|tester|phone"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Nougat Phone Tester"
+    name: "buildbucket/luci.chromium-m88.ci/Nougat Phone Tester"
     category: "chromium.android|tester|phone"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Oreo Phone Tester"
+    name: "buildbucket/luci.chromium-m88.ci/Oreo Phone Tester"
     category: "chromium.android|tester|phone"
     short_name: "O"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-pie-arm64-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/android-pie-arm64-dbg"
     category: "chromium.android|tester|phone"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android WebView M (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android WebView M (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android WebView N (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android WebView N (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android WebView O (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android WebView O (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "O"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android WebView P (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android WebView P (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-nougat-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-nougat-arm64-rel"
     category: "chromium.android|builder_tester|arm64"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-marshmallow-x86-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-marshmallow-x86-rel"
     category: "chromium.android|builder_tester|x86"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-lollipop-arm-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-lollipop-arm-rel"
     category: "chromium.android|on_cq"
     short_name: "L"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-marshmallow-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-marshmallow-arm64-rel"
     category: "chromium.android|on_cq"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-pie-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-pie-arm64-rel"
     category: "chromium.android|on_cq"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Cast Android (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Cast Android (dbg)"
     category: "chromium.android|on_cq"
     short_name: "cst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux TSan Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Linux TSan Builder"
     category: "chromium.memory|linux|TSan v2"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux TSan Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Linux TSan Tests"
     category: "chromium.memory|linux|TSan v2"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux ASan LSan Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Linux ASan LSan Builder"
     category: "chromium.memory|linux|asan lsan"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux ASan LSan Tests (1)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux ASan LSan Tests (1)"
     category: "chromium.memory|linux|asan lsan"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux ASan Tests (sandboxed)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux ASan Tests (sandboxed)"
     category: "chromium.memory|linux|asan lsan"
     short_name: "sbx"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Linux x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Linux x64 DEPS Builder"
     category: "chromium.dawn|DEPS|Linux|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
     category: "chromium.dawn|DEPS|Linux|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
     category: "chromium.dawn|DEPS|Linux|Nvidia"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Mac x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Mac x64 DEPS Builder"
     category: "chromium.dawn|DEPS|Mac|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Mac x64 DEPS Release (AMD)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Mac x64 DEPS Release (AMD)"
     category: "chromium.dawn|DEPS|Mac|AMD"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Mac x64 DEPS Release (Intel)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Mac x64 DEPS Release (Intel)"
     category: "chromium.dawn|DEPS|Mac|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x86 DEPS Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x86 DEPS Builder"
     category: "chromium.dawn|DEPS|Windows|Builder"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x64 DEPS Builder"
     category: "chromium.dawn|DEPS|Windows|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
     category: "chromium.dawn|DEPS|Windows|Intel"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
     category: "chromium.dawn|DEPS|Windows|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
     category: "chromium.dawn|DEPS|Windows|Nvidia"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
     category: "chromium.dawn|DEPS|Windows|Nvidia"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/GPU Win x64 Builder"
+    name: "buildbucket/luci.chromium-m88.ci/GPU Win x64 Builder"
     category: "chromium.gpu|Windows"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win10 x64 Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Win10 x64 Release (NVIDIA)"
     category: "chromium.gpu|Windows"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/GPU Mac Builder"
+    name: "buildbucket/luci.chromium-m88.ci/GPU Mac Builder"
     category: "chromium.gpu|Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac Release (Intel)"
+    name: "buildbucket/luci.chromium-m88.ci/Mac Release (Intel)"
     category: "chromium.gpu|Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac Retina Release (AMD)"
+    name: "buildbucket/luci.chromium-m88.ci/Mac Retina Release (AMD)"
     category: "chromium.gpu|Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/GPU Linux Builder"
+    name: "buildbucket/luci.chromium-m88.ci/GPU Linux Builder"
     category: "chromium.gpu|Linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Release (NVIDIA)"
     category: "chromium.gpu|Linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android Release (Nexus 5X)"
+    name: "buildbucket/luci.chromium-m88.ci/Android Release (Nexus 5X)"
     category: "chromium.gpu|Android"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/ios-simulator-cronet"
+    name: "buildbucket/luci.chromium-m88.ci/ios-simulator-cronet"
     category: "chromium.fyi|cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/VR Linux"
+    name: "buildbucket/luci.chromium-m88.ci/VR Linux"
     category: "chromium.fyi|linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Ozone Tester (Headless)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Ozone Tester (Headless)"
     category: "chromium.fyi|linux"
     short_name: "loh"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Ozone Tester (Wayland)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Ozone Tester (Wayland)"
     category: "chromium.fyi|linux"
     short_name: "low"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Ozone Tester (X11)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Ozone Tester (X11)"
     category: "chromium.fyi|linux"
     short_name: "lox"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/linux-official"
+    name: "buildbucket/luci.chromium-m88.ci/linux-official"
     category: "chromium.fyi|linux"
     short_name: "off"
   }
@@ -515,7 +520,7 @@ consoles {
       name: "Chromium"
       links {
         text: "source"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324"
         alt: "Chromium source code repository"
       }
       links {
@@ -548,27 +553,27 @@ consoles {
       name: "Consoles"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/chromium.android"
+        url: "/p/chromium-m88/g/chromium.android"
         alt: "Chromium Android console"
       }
       links {
         text: "dawn"
-        url: "/p/chromium-m87/g/chromium.dawn"
+        url: "/p/chromium-m88/g/chromium.dawn"
         alt: "Chromium Dawn console"
       }
       links {
         text: "fyi"
-        url: "/p/chromium-m87/g/chromium.fyi"
+        url: "/p/chromium-m88/g/chromium.fyi"
         alt: "Chromium FYI console"
       }
       links {
         text: "gpu"
-        url: "/p/chromium-m87/g/chromium.gpu"
+        url: "/p/chromium-m88/g/chromium.gpu"
         alt: "Chromium GPU console"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/chromium.chromiumos"
+        url: "/p/chromium-m88/g/chromium.chromiumos"
         alt: "ChromiumOS console"
       }
     }
@@ -584,32 +589,32 @@ consoles {
       name: "Tryservers"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/tryserver.chromium.android/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.android/builders"
         alt: "Android"
       }
       links {
         text: "blink"
-        url: "/p/chromium-m87/g/tryserver.blink/builders"
+        url: "/p/chromium-m88/g/tryserver.blink/builders"
         alt: "Blink"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/tryserver.chromium.chromiumos/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
       }
       links {
         text: "linux"
-        url: "/p/chromium-m87/g/tryserver.chromium.linux/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.linux/builders"
         alt: "Linux"
       }
       links {
         text: "mac"
-        url: "/p/chromium-m87/g/tryserver.chromium.mac/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.mac/builders"
         alt: "Mac"
       }
       links {
         text: "win"
-        url: "/p/chromium-m87/g/tryserver.chromium.win/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.win/builders"
         alt: "Win"
       }
     }
@@ -622,450 +627,455 @@ consoles {
       }
       links {
         text: "customize"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280/infra/config/generated/luci-milo.cfg"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324/infra/config/generated/luci-milo.cfg"
         alt: "Customize this console"
       }
     }
     console_groups {
-      console_ids: "chromium-m87/chromium"
-      console_ids: "chromium-m87/chromium.win"
-      console_ids: "chromium-m87/chromium.mac"
-      console_ids: "chromium-m87/chromium.linux"
-      console_ids: "chromium-m87/chromium.chromiumos"
-      console_ids: "chromium-m87/chromium.memory"
-      console_ids: "chromium-m87/chromium.gpu"
-      console_ids: "chromium-m87/chromium.android"
+      console_ids: "chromium-m88/chromium"
+      console_ids: "chromium-m88/chromium.win"
+      console_ids: "chromium-m88/chromium.mac"
+      console_ids: "chromium-m88/chromium.linux"
+      console_ids: "chromium-m88/chromium.chromiumos"
+      console_ids: "chromium-m88/chromium.memory"
+      console_ids: "chromium-m88/chromium.gpu"
+      console_ids: "chromium-m88/chromium.android"
     }
   }
 }
 consoles {
   id: "mirrors"
-  name: "Chromium M87 CQ Mirrors Console"
+  name: "Chromium M88 CQ Mirrors Console"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4280"
+  refs: "regexp:refs/branch-heads/4324"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win x64 Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Win x64 Builder"
     category: "chromium.win|release|builder"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win 7 Tests x64 (1)"
+    name: "buildbucket/luci.chromium-m88.ci/Win 7 Tests x64 (1)"
     category: "chromium.win|release|tester"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win10 Tests x64"
+    name: "buildbucket/luci.chromium-m88.ci/Win10 Tests x64"
     category: "chromium.win|release|tester"
     short_name: "w10"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Win Builder (dbg)"
     category: "chromium.win|debug|builder"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win7 Tests (dbg)(1)"
+    name: "buildbucket/luci.chromium-m88.ci/Win7 Tests (dbg)(1)"
     category: "chromium.win|debug|tester"
     short_name: "7"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Mac Builder"
     category: "chromium.mac|release"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.10 Tests"
-    category: "chromium.mac|release"
-    short_name: "10"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.11 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.11 Tests"
     category: "chromium.mac|release"
     short_name: "11"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.12 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.12 Tests"
     category: "chromium.mac|release"
     short_name: "12"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.13 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.13 Tests"
     category: "chromium.mac|release"
     short_name: "13"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.14 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.14 Tests"
     category: "chromium.mac|release"
     short_name: "14"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.15 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.15 Tests"
     category: "chromium.mac|release"
     short_name: "15"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Mac Builder (dbg)"
     category: "chromium.mac|debug"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.13 Tests (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.13 Tests (dbg)"
     category: "chromium.mac|debug"
     short_name: "13"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/ios-simulator"
+    name: "buildbucket/luci.chromium-m88.ci/ios-simulator"
     category: "chromium.mac|ios|default"
     short_name: "sim"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/ios-simulator-full-configs"
+    name: "buildbucket/luci.chromium-m88.ci/ios-simulator-full-configs"
     category: "chromium.mac|ios|default"
     short_name: "ful"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Builder"
     category: "chromium.linux|release"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tests"
     category: "chromium.linux|release"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/linux-ozone-rel"
+    name: "buildbucket/luci.chromium-m88.ci/linux-ozone-rel"
     category: "chromium.linux|release"
     short_name: "ozo"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tester (Ozone Headless)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tester (Ozone Headless)"
     category: "chromium.linux|release|ozone"
     short_name: "ltoh"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tester (Ozone Wayland)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tester (Ozone Wayland)"
     category: "chromium.linux|release|ozone"
     short_name: "ltow"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tester (Ozone X11)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tester (Ozone X11)"
     category: "chromium.linux|release|ozone"
     short_name: "ltox"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Builder (dbg)"
     category: "chromium.linux|debug|builder"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tests (dbg)(1)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tests (dbg)(1)"
     category: "chromium.linux|debug|tester"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Cast Linux"
+    name: "buildbucket/luci.chromium-m88.ci/Cast Linux"
     category: "chromium.linux|cast"
     short_name: "vid"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Fuchsia ARM64"
+    name: "buildbucket/luci.chromium-m88.ci/Fuchsia ARM64"
     category: "chromium.linux|fuchsia|a64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/fuchsia-arm64-cast"
+    name: "buildbucket/luci.chromium-m88.ci/fuchsia-arm64-cast"
     category: "chromium.linux|fuchsia|cast"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/fuchsia-x64-cast"
+    name: "buildbucket/luci.chromium-m88.ci/fuchsia-x64-cast"
     category: "chromium.linux|fuchsia|cast"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Fuchsia x64"
+    name: "buildbucket/luci.chromium-m88.ci/Fuchsia x64"
     category: "chromium.linux|fuchsia|x64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/linux-chromeos-rel"
+    name: "buildbucket/luci.chromium-m88.ci/linux-chromeos-rel"
     category: "chromium.chromiumos|default"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/linux-chromeos-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/linux-chromeos-dbg"
     category: "chromium.chromiumos|default"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/chromeos-amd64-generic-lacros-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/linux-lacros-builder-rel"
+    category: "chromium.chromiumos|default"
+    short_name: "lcr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m88.ci/linux-lacros-tester-rel"
+    category: "chromium.chromiumos|default"
+    short_name: "lcr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m88.ci/chromeos-amd64-generic-lacros-dbg"
     category: "chromium.chromiumos|lacros|x64"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/chromeos-arm-generic-rel"
+    name: "buildbucket/luci.chromium-m88.ci/chromeos-arm-generic-rel"
     category: "chromium.chromiumos|simple|release"
     short_name: "arm"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/chromeos-amd64-generic-rel"
+    name: "buildbucket/luci.chromium-m88.ci/chromeos-amd64-generic-rel"
     category: "chromium.chromiumos|simple|release|x64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/chromeos-amd64-generic-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/chromeos-amd64-generic-dbg"
     category: "chromium.chromiumos|simple|debug|x64"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-cronet-arm-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/android-cronet-arm-dbg"
     category: "chromium.android|cronet|arm"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-cronet-arm-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-cronet-arm-rel"
     category: "chromium.android|cronet|arm"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-cronet-arm-rel-kitkat-tests"
+    name: "buildbucket/luci.chromium-m88.ci/android-cronet-arm-rel-kitkat-tests"
     category: "chromium.android|cronet|test"
     short_name: "k"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-cronet-arm-rel-lollipop-tests"
+    name: "buildbucket/luci.chromium-m88.ci/android-cronet-arm-rel-lollipop-tests"
     category: "chromium.android|cronet|test"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android arm Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android arm Builder (dbg)"
     category: "chromium.android|builder|arm"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android arm64 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android arm64 Builder (dbg)"
     category: "chromium.android|builder|arm"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android x86 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android x86 Builder (dbg)"
     category: "chromium.android|builder|x86"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android x64 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android x64 Builder (dbg)"
     category: "chromium.android|builder|x86"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Marshmallow 64 bit Tester"
+    name: "buildbucket/luci.chromium-m88.ci/Marshmallow 64 bit Tester"
     category: "chromium.android|tester|phone"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Nougat Phone Tester"
+    name: "buildbucket/luci.chromium-m88.ci/Nougat Phone Tester"
     category: "chromium.android|tester|phone"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Oreo Phone Tester"
+    name: "buildbucket/luci.chromium-m88.ci/Oreo Phone Tester"
     category: "chromium.android|tester|phone"
     short_name: "O"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-pie-arm64-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/android-pie-arm64-dbg"
     category: "chromium.android|tester|phone"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android WebView M (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android WebView M (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android WebView N (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android WebView N (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android WebView O (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android WebView O (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "O"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android WebView P (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android WebView P (dbg)"
     category: "chromium.android|tester|webview"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-nougat-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-nougat-arm64-rel"
     category: "chromium.android|builder_tester|arm64"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-marshmallow-x86-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-marshmallow-x86-rel"
     category: "chromium.android|builder_tester|x86"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-lollipop-arm-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-lollipop-arm-rel"
     category: "chromium.android|on_cq"
     short_name: "L"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-marshmallow-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-marshmallow-arm64-rel"
     category: "chromium.android|on_cq"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-pie-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-pie-arm64-rel"
     category: "chromium.android|on_cq"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Cast Android (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Cast Android (dbg)"
     category: "chromium.android|on_cq"
     short_name: "cst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux TSan Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Linux TSan Builder"
     category: "chromium.memory|linux|TSan v2"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux TSan Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Linux TSan Tests"
     category: "chromium.memory|linux|TSan v2"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux ASan LSan Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Linux ASan LSan Builder"
     category: "chromium.memory|linux|asan lsan"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux ASan LSan Tests (1)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux ASan LSan Tests (1)"
     category: "chromium.memory|linux|asan lsan"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux ASan Tests (sandboxed)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux ASan Tests (sandboxed)"
     category: "chromium.memory|linux|asan lsan"
     short_name: "sbx"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Linux x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Linux x64 DEPS Builder"
     category: "chromium.dawn|DEPS|Linux|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
     category: "chromium.dawn|DEPS|Linux|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
     category: "chromium.dawn|DEPS|Linux|Nvidia"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Mac x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Mac x64 DEPS Builder"
     category: "chromium.dawn|DEPS|Mac|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Mac x64 DEPS Release (AMD)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Mac x64 DEPS Release (AMD)"
     category: "chromium.dawn|DEPS|Mac|AMD"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Mac x64 DEPS Release (Intel)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Mac x64 DEPS Release (Intel)"
     category: "chromium.dawn|DEPS|Mac|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x86 DEPS Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x86 DEPS Builder"
     category: "chromium.dawn|DEPS|Windows|Builder"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x64 DEPS Builder"
     category: "chromium.dawn|DEPS|Windows|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
     category: "chromium.dawn|DEPS|Windows|Intel"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
     category: "chromium.dawn|DEPS|Windows|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
     category: "chromium.dawn|DEPS|Windows|Nvidia"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
     category: "chromium.dawn|DEPS|Windows|Nvidia"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/GPU Win x64 Builder"
+    name: "buildbucket/luci.chromium-m88.ci/GPU Win x64 Builder"
     category: "chromium.gpu|Windows"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win10 x64 Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Win10 x64 Release (NVIDIA)"
     category: "chromium.gpu|Windows"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/GPU Mac Builder"
+    name: "buildbucket/luci.chromium-m88.ci/GPU Mac Builder"
     category: "chromium.gpu|Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac Release (Intel)"
+    name: "buildbucket/luci.chromium-m88.ci/Mac Release (Intel)"
     category: "chromium.gpu|Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac Retina Release (AMD)"
+    name: "buildbucket/luci.chromium-m88.ci/Mac Retina Release (AMD)"
     category: "chromium.gpu|Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/GPU Linux Builder"
+    name: "buildbucket/luci.chromium-m88.ci/GPU Linux Builder"
     category: "chromium.gpu|Linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Release (NVIDIA)"
     category: "chromium.gpu|Linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android Release (Nexus 5X)"
+    name: "buildbucket/luci.chromium-m88.ci/Android Release (Nexus 5X)"
     category: "chromium.gpu|Android"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/ios-simulator-cronet"
+    name: "buildbucket/luci.chromium-m88.ci/ios-simulator-cronet"
     category: "chromium.fyi|cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/VR Linux"
+    name: "buildbucket/luci.chromium-m88.ci/VR Linux"
     category: "chromium.fyi|linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Ozone Tester (Headless)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Ozone Tester (Headless)"
     category: "chromium.fyi|linux"
     short_name: "loh"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Ozone Tester (Wayland)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Ozone Tester (Wayland)"
     category: "chromium.fyi|linux"
     short_name: "low"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Ozone Tester (X11)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Ozone Tester (X11)"
     category: "chromium.fyi|linux"
     short_name: "lox"
   }
@@ -1114,7 +1124,7 @@ consoles {
       name: "Chromium"
       links {
         text: "source"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324"
         alt: "Chromium source code repository"
       }
       links {
@@ -1147,27 +1157,27 @@ consoles {
       name: "Consoles"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/chromium.android"
+        url: "/p/chromium-m88/g/chromium.android"
         alt: "Chromium Android console"
       }
       links {
         text: "dawn"
-        url: "/p/chromium-m87/g/chromium.dawn"
+        url: "/p/chromium-m88/g/chromium.dawn"
         alt: "Chromium Dawn console"
       }
       links {
         text: "fyi"
-        url: "/p/chromium-m87/g/chromium.fyi"
+        url: "/p/chromium-m88/g/chromium.fyi"
         alt: "Chromium FYI console"
       }
       links {
         text: "gpu"
-        url: "/p/chromium-m87/g/chromium.gpu"
+        url: "/p/chromium-m88/g/chromium.gpu"
         alt: "Chromium GPU console"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/chromium.chromiumos"
+        url: "/p/chromium-m88/g/chromium.chromiumos"
         alt: "ChromiumOS console"
       }
     }
@@ -1183,32 +1193,32 @@ consoles {
       name: "Tryservers"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/tryserver.chromium.android/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.android/builders"
         alt: "Android"
       }
       links {
         text: "blink"
-        url: "/p/chromium-m87/g/tryserver.blink/builders"
+        url: "/p/chromium-m88/g/tryserver.blink/builders"
         alt: "Blink"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/tryserver.chromium.chromiumos/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
       }
       links {
         text: "linux"
-        url: "/p/chromium-m87/g/tryserver.chromium.linux/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.linux/builders"
         alt: "Linux"
       }
       links {
         text: "mac"
-        url: "/p/chromium-m87/g/tryserver.chromium.mac/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.mac/builders"
         alt: "Mac"
       }
       links {
         text: "win"
-        url: "/p/chromium-m87/g/tryserver.chromium.win/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.win/builders"
         alt: "Win"
       }
     }
@@ -1221,180 +1231,177 @@ consoles {
       }
       links {
         text: "customize"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280/infra/config/generated/luci-milo.cfg"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324/infra/config/generated/luci-milo.cfg"
         alt: "Customize this console"
       }
     }
     console_groups {
-      console_ids: "chromium-m87/chromium"
-      console_ids: "chromium-m87/chromium.win"
-      console_ids: "chromium-m87/chromium.mac"
-      console_ids: "chromium-m87/chromium.linux"
-      console_ids: "chromium-m87/chromium.chromiumos"
-      console_ids: "chromium-m87/chromium.memory"
-      console_ids: "chromium-m87/chromium.gpu"
-      console_ids: "chromium-m87/chromium.android"
+      console_ids: "chromium-m88/chromium"
+      console_ids: "chromium-m88/chromium.win"
+      console_ids: "chromium-m88/chromium.mac"
+      console_ids: "chromium-m88/chromium.linux"
+      console_ids: "chromium-m88/chromium.chromiumos"
+      console_ids: "chromium-m88/chromium.memory"
+      console_ids: "chromium-m88/chromium.gpu"
+      console_ids: "chromium-m88/chromium.android"
     }
   }
 }
 consoles {
   id: "try"
-  name: "Chromium M87 CQ console"
-  builders {
-    name: "buildbucket/luci.chromium-m87.try/android-binary-size"
-  }
+  name: "Chromium M88 CQ Console"
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-cronet-arm-dbg"
+    name: "buildbucket/luci.chromium-m88.try/android-binary-size"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-lollipop-arm-rel"
+    name: "buildbucket/luci.chromium-m88.try/android-cronet-arm-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-marshmallow-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.try/android-lollipop-arm-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-pie-arm64-dbg"
+    name: "buildbucket/luci.chromium-m88.try/android-marshmallow-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-pie-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.try/android-pie-arm64-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_compile_dbg"
+    name: "buildbucket/luci.chromium-m88.try/android-pie-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_compile_x64_dbg"
+    name: "buildbucket/luci.chromium-m88.try/android_compile_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_compile_x86_dbg"
+    name: "buildbucket/luci.chromium-m88.try/android_compile_x64_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_cronet"
+    name: "buildbucket/luci.chromium-m88.try/android_compile_x86_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m88.try/android_cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/cast_shell_android"
+    name: "buildbucket/luci.chromium-m88.try/android_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/cast_shell_linux"
+    name: "buildbucket/luci.chromium-m88.try/cast_shell_android"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/chromeos-amd64-generic-dbg"
+    name: "buildbucket/luci.chromium-m88.try/cast_shell_linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/chromeos-amd64-generic-rel"
+    name: "buildbucket/luci.chromium-m88.try/chromeos-amd64-generic-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/chromeos-arm-generic-rel"
+    name: "buildbucket/luci.chromium-m88.try/chromeos-amd64-generic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/chromeos-kevin-rel"
+    name: "buildbucket/luci.chromium-m88.try/chromeos-arm-generic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/chromium_presubmit"
+    name: "buildbucket/luci.chromium-m88.try/chromeos-kevin-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/closure_compilation"
+    name: "buildbucket/luci.chromium-m88.try/chromium_presubmit"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/dawn-linux-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m88.try/dawn-linux-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/dawn-mac-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m88.try/dawn-mac-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/dawn-win10-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m88.try/dawn-win10-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/dawn-win10-x86-deps-rel"
+    name: "buildbucket/luci.chromium-m88.try/dawn-win10-x86-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/fuchsia-arm64-cast"
+    name: "buildbucket/luci.chromium-m88.try/fuchsia-arm64-cast"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/fuchsia-x64-cast"
+    name: "buildbucket/luci.chromium-m88.try/fuchsia-x64-cast"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/fuchsia_arm64"
+    name: "buildbucket/luci.chromium-m88.try/fuchsia_arm64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/fuchsia_x64"
+    name: "buildbucket/luci.chromium-m88.try/fuchsia_x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/ios-simulator"
+    name: "buildbucket/luci.chromium-m88.try/ios-simulator"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/ios-simulator-cronet"
+    name: "buildbucket/luci.chromium-m88.try/ios-simulator-cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/ios-simulator-full-configs"
+    name: "buildbucket/luci.chromium-m88.try/ios-simulator-full-configs"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-blink-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux-blink-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-chromeos-compile-dbg"
+    name: "buildbucket/luci.chromium-m88.try/linux-chromeos-compile-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-chromeos-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux-chromeos-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-libfuzzer-asan-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux-libfuzzer-asan-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-ozone-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux-ozone-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_chromium_asan_rel_ng"
+    name: "buildbucket/luci.chromium-m88.try/linux_chromium_asan_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m88.try/linux_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_chromium_dbg_ng"
+    name: "buildbucket/luci.chromium-m88.try/linux_chromium_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_chromium_tsan_rel_ng"
+    name: "buildbucket/luci.chromium-m88.try/linux_chromium_tsan_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_layout_tests_composite_after_paint"
+    name: "buildbucket/luci.chromium-m88.try/linux_layout_tests_composite_after_paint"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_layout_tests_layout_ng_disabled"
+    name: "buildbucket/luci.chromium-m88.try/linux_layout_tests_layout_ng_disabled"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m88.try/linux_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_vr"
+    name: "buildbucket/luci.chromium-m88.try/linux_vr"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/mac-rel"
+    name: "buildbucket/luci.chromium-m88.try/mac-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/mac_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m88.try/mac_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/mac_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m88.try/mac_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win-libfuzzer-asan-rel"
+    name: "buildbucket/luci.chromium-m88.try/win-libfuzzer-asan-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win10_chromium_x64_rel_ng"
+    name: "buildbucket/luci.chromium-m88.try/win10_chromium_x64_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win7-rel"
+    name: "buildbucket/luci.chromium-m88.try/win7-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m88.try/win_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m88.try/win_optional_gpu_tests_rel"
   }
   builder_view_only: true
 }
@@ -1402,25 +1409,25 @@ consoles {
   id: "chromium"
   name: "chromium"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4280"
+  refs: "regexp:refs/branch-heads/4324"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-official"
+    name: "buildbucket/luci.chromium-m88.ci/android-official"
     category: "android"
     short_name: "off"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/fuchsia-official"
+    name: "buildbucket/luci.chromium-m88.ci/fuchsia-official"
     category: "fuchsia"
     short_name: "off"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/win32-official"
+    name: "buildbucket/luci.chromium-m88.ci/win32-official"
     category: "win|off"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/win-official"
+    name: "buildbucket/luci.chromium-m88.ci/win-official"
     category: "win|off"
     short_name: "64"
   }
@@ -1469,7 +1476,7 @@ consoles {
       name: "Chromium"
       links {
         text: "source"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324"
         alt: "Chromium source code repository"
       }
       links {
@@ -1502,27 +1509,27 @@ consoles {
       name: "Consoles"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/chromium.android"
+        url: "/p/chromium-m88/g/chromium.android"
         alt: "Chromium Android console"
       }
       links {
         text: "dawn"
-        url: "/p/chromium-m87/g/chromium.dawn"
+        url: "/p/chromium-m88/g/chromium.dawn"
         alt: "Chromium Dawn console"
       }
       links {
         text: "fyi"
-        url: "/p/chromium-m87/g/chromium.fyi"
+        url: "/p/chromium-m88/g/chromium.fyi"
         alt: "Chromium FYI console"
       }
       links {
         text: "gpu"
-        url: "/p/chromium-m87/g/chromium.gpu"
+        url: "/p/chromium-m88/g/chromium.gpu"
         alt: "Chromium GPU console"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/chromium.chromiumos"
+        url: "/p/chromium-m88/g/chromium.chromiumos"
         alt: "ChromiumOS console"
       }
     }
@@ -1538,32 +1545,32 @@ consoles {
       name: "Tryservers"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/tryserver.chromium.android/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.android/builders"
         alt: "Android"
       }
       links {
         text: "blink"
-        url: "/p/chromium-m87/g/tryserver.blink/builders"
+        url: "/p/chromium-m88/g/tryserver.blink/builders"
         alt: "Blink"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/tryserver.chromium.chromiumos/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
       }
       links {
         text: "linux"
-        url: "/p/chromium-m87/g/tryserver.chromium.linux/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.linux/builders"
         alt: "Linux"
       }
       links {
         text: "mac"
-        url: "/p/chromium-m87/g/tryserver.chromium.mac/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.mac/builders"
         alt: "Mac"
       }
       links {
         text: "win"
-        url: "/p/chromium-m87/g/tryserver.chromium.win/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.win/builders"
         alt: "Win"
       }
     }
@@ -1576,19 +1583,19 @@ consoles {
       }
       links {
         text: "customize"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280/infra/config/generated/luci-milo.cfg"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324/infra/config/generated/luci-milo.cfg"
         alt: "Customize this console"
       }
     }
     console_groups {
-      console_ids: "chromium-m87/chromium"
-      console_ids: "chromium-m87/chromium.win"
-      console_ids: "chromium-m87/chromium.mac"
-      console_ids: "chromium-m87/chromium.linux"
-      console_ids: "chromium-m87/chromium.chromiumos"
-      console_ids: "chromium-m87/chromium.memory"
-      console_ids: "chromium-m87/chromium.gpu"
-      console_ids: "chromium-m87/chromium.android"
+      console_ids: "chromium-m88/chromium"
+      console_ids: "chromium-m88/chromium.win"
+      console_ids: "chromium-m88/chromium.mac"
+      console_ids: "chromium-m88/chromium.linux"
+      console_ids: "chromium-m88/chromium.chromiumos"
+      console_ids: "chromium-m88/chromium.memory"
+      console_ids: "chromium-m88/chromium.gpu"
+      console_ids: "chromium-m88/chromium.android"
     }
   }
   include_experimental_builds: true
@@ -1597,115 +1604,115 @@ consoles {
   id: "chromium.android"
   name: "chromium.android"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4280"
+  refs: "regexp:refs/branch-heads/4324"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-cronet-arm-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/android-cronet-arm-dbg"
     category: "cronet|arm"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-cronet-arm-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-cronet-arm-rel"
     category: "cronet|arm"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-cronet-arm-rel-kitkat-tests"
+    name: "buildbucket/luci.chromium-m88.ci/android-cronet-arm-rel-kitkat-tests"
     category: "cronet|test"
     short_name: "k"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-cronet-arm-rel-lollipop-tests"
+    name: "buildbucket/luci.chromium-m88.ci/android-cronet-arm-rel-lollipop-tests"
     category: "cronet|test"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android arm Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android arm Builder (dbg)"
     category: "builder|arm"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android arm64 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android arm64 Builder (dbg)"
     category: "builder|arm"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android x86 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android x86 Builder (dbg)"
     category: "builder|x86"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android x64 Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android x64 Builder (dbg)"
     category: "builder|x86"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Marshmallow 64 bit Tester"
+    name: "buildbucket/luci.chromium-m88.ci/Marshmallow 64 bit Tester"
     category: "tester|phone"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Nougat Phone Tester"
+    name: "buildbucket/luci.chromium-m88.ci/Nougat Phone Tester"
     category: "tester|phone"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Oreo Phone Tester"
+    name: "buildbucket/luci.chromium-m88.ci/Oreo Phone Tester"
     category: "tester|phone"
     short_name: "O"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-pie-arm64-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/android-pie-arm64-dbg"
     category: "tester|phone"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android WebView M (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android WebView M (dbg)"
     category: "tester|webview"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android WebView N (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android WebView N (dbg)"
     category: "tester|webview"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android WebView O (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android WebView O (dbg)"
     category: "tester|webview"
     short_name: "O"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android WebView P (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Android WebView P (dbg)"
     category: "tester|webview"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-nougat-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-nougat-arm64-rel"
     category: "builder_tester|arm64"
     short_name: "N"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-marshmallow-x86-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-marshmallow-x86-rel"
     category: "builder_tester|x86"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-lollipop-arm-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-lollipop-arm-rel"
     category: "on_cq"
     short_name: "L"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-marshmallow-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-marshmallow-arm64-rel"
     category: "on_cq"
     short_name: "M"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/android-pie-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.ci/android-pie-arm64-rel"
     category: "on_cq"
     short_name: "P"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Cast Android (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Cast Android (dbg)"
     category: "on_cq"
     short_name: "cst"
   }
@@ -1754,7 +1761,7 @@ consoles {
       name: "Chromium"
       links {
         text: "source"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324"
         alt: "Chromium source code repository"
       }
       links {
@@ -1787,27 +1794,27 @@ consoles {
       name: "Consoles"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/chromium.android"
+        url: "/p/chromium-m88/g/chromium.android"
         alt: "Chromium Android console"
       }
       links {
         text: "dawn"
-        url: "/p/chromium-m87/g/chromium.dawn"
+        url: "/p/chromium-m88/g/chromium.dawn"
         alt: "Chromium Dawn console"
       }
       links {
         text: "fyi"
-        url: "/p/chromium-m87/g/chromium.fyi"
+        url: "/p/chromium-m88/g/chromium.fyi"
         alt: "Chromium FYI console"
       }
       links {
         text: "gpu"
-        url: "/p/chromium-m87/g/chromium.gpu"
+        url: "/p/chromium-m88/g/chromium.gpu"
         alt: "Chromium GPU console"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/chromium.chromiumos"
+        url: "/p/chromium-m88/g/chromium.chromiumos"
         alt: "ChromiumOS console"
       }
     }
@@ -1823,32 +1830,32 @@ consoles {
       name: "Tryservers"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/tryserver.chromium.android/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.android/builders"
         alt: "Android"
       }
       links {
         text: "blink"
-        url: "/p/chromium-m87/g/tryserver.blink/builders"
+        url: "/p/chromium-m88/g/tryserver.blink/builders"
         alt: "Blink"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/tryserver.chromium.chromiumos/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
       }
       links {
         text: "linux"
-        url: "/p/chromium-m87/g/tryserver.chromium.linux/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.linux/builders"
         alt: "Linux"
       }
       links {
         text: "mac"
-        url: "/p/chromium-m87/g/tryserver.chromium.mac/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.mac/builders"
         alt: "Mac"
       }
       links {
         text: "win"
-        url: "/p/chromium-m87/g/tryserver.chromium.win/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.win/builders"
         alt: "Win"
       }
     }
@@ -1861,19 +1868,19 @@ consoles {
       }
       links {
         text: "customize"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280/infra/config/generated/luci-milo.cfg"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324/infra/config/generated/luci-milo.cfg"
         alt: "Customize this console"
       }
     }
     console_groups {
-      console_ids: "chromium-m87/chromium"
-      console_ids: "chromium-m87/chromium.win"
-      console_ids: "chromium-m87/chromium.mac"
-      console_ids: "chromium-m87/chromium.linux"
-      console_ids: "chromium-m87/chromium.chromiumos"
-      console_ids: "chromium-m87/chromium.memory"
-      console_ids: "chromium-m87/chromium.gpu"
-      console_ids: "chromium-m87/chromium.android"
+      console_ids: "chromium-m88/chromium"
+      console_ids: "chromium-m88/chromium.win"
+      console_ids: "chromium-m88/chromium.mac"
+      console_ids: "chromium-m88/chromium.linux"
+      console_ids: "chromium-m88/chromium.chromiumos"
+      console_ids: "chromium-m88/chromium.memory"
+      console_ids: "chromium-m88/chromium.gpu"
+      console_ids: "chromium-m88/chromium.android"
     }
   }
 }
@@ -1881,40 +1888,50 @@ consoles {
   id: "chromium.chromiumos"
   name: "chromium.chromiumos"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4280"
+  refs: "regexp:refs/branch-heads/4324"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/linux-chromeos-rel"
+    name: "buildbucket/luci.chromium-m88.ci/linux-chromeos-rel"
     category: "default"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/linux-chromeos-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/linux-chromeos-dbg"
     category: "default"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/chromeos-amd64-generic-lacros-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/linux-lacros-builder-rel"
+    category: "default"
+    short_name: "lcr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m88.ci/linux-lacros-tester-rel"
+    category: "default"
+    short_name: "lcr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m88.ci/chromeos-amd64-generic-lacros-dbg"
     category: "lacros|x64"
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/chromeos-arm-generic-rel"
+    name: "buildbucket/luci.chromium-m88.ci/chromeos-arm-generic-rel"
     category: "simple|release"
     short_name: "arm"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/chromeos-kevin-rel"
+    name: "buildbucket/luci.chromium-m88.ci/chromeos-kevin-rel"
     category: "simple|release"
     short_name: "kvn"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/chromeos-amd64-generic-rel"
+    name: "buildbucket/luci.chromium-m88.ci/chromeos-amd64-generic-rel"
     category: "simple|release|x64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/chromeos-amd64-generic-dbg"
+    name: "buildbucket/luci.chromium-m88.ci/chromeos-amd64-generic-dbg"
     category: "simple|debug|x64"
     short_name: "dbg"
   }
@@ -1963,7 +1980,7 @@ consoles {
       name: "Chromium"
       links {
         text: "source"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324"
         alt: "Chromium source code repository"
       }
       links {
@@ -1996,27 +2013,27 @@ consoles {
       name: "Consoles"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/chromium.android"
+        url: "/p/chromium-m88/g/chromium.android"
         alt: "Chromium Android console"
       }
       links {
         text: "dawn"
-        url: "/p/chromium-m87/g/chromium.dawn"
+        url: "/p/chromium-m88/g/chromium.dawn"
         alt: "Chromium Dawn console"
       }
       links {
         text: "fyi"
-        url: "/p/chromium-m87/g/chromium.fyi"
+        url: "/p/chromium-m88/g/chromium.fyi"
         alt: "Chromium FYI console"
       }
       links {
         text: "gpu"
-        url: "/p/chromium-m87/g/chromium.gpu"
+        url: "/p/chromium-m88/g/chromium.gpu"
         alt: "Chromium GPU console"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/chromium.chromiumos"
+        url: "/p/chromium-m88/g/chromium.chromiumos"
         alt: "ChromiumOS console"
       }
     }
@@ -2032,32 +2049,32 @@ consoles {
       name: "Tryservers"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/tryserver.chromium.android/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.android/builders"
         alt: "Android"
       }
       links {
         text: "blink"
-        url: "/p/chromium-m87/g/tryserver.blink/builders"
+        url: "/p/chromium-m88/g/tryserver.blink/builders"
         alt: "Blink"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/tryserver.chromium.chromiumos/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
       }
       links {
         text: "linux"
-        url: "/p/chromium-m87/g/tryserver.chromium.linux/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.linux/builders"
         alt: "Linux"
       }
       links {
         text: "mac"
-        url: "/p/chromium-m87/g/tryserver.chromium.mac/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.mac/builders"
         alt: "Mac"
       }
       links {
         text: "win"
-        url: "/p/chromium-m87/g/tryserver.chromium.win/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.win/builders"
         alt: "Win"
       }
     }
@@ -2070,19 +2087,19 @@ consoles {
       }
       links {
         text: "customize"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280/infra/config/generated/luci-milo.cfg"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324/infra/config/generated/luci-milo.cfg"
         alt: "Customize this console"
       }
     }
     console_groups {
-      console_ids: "chromium-m87/chromium"
-      console_ids: "chromium-m87/chromium.win"
-      console_ids: "chromium-m87/chromium.mac"
-      console_ids: "chromium-m87/chromium.linux"
-      console_ids: "chromium-m87/chromium.chromiumos"
-      console_ids: "chromium-m87/chromium.memory"
-      console_ids: "chromium-m87/chromium.gpu"
-      console_ids: "chromium-m87/chromium.android"
+      console_ids: "chromium-m88/chromium"
+      console_ids: "chromium-m88/chromium.win"
+      console_ids: "chromium-m88/chromium.mac"
+      console_ids: "chromium-m88/chromium.linux"
+      console_ids: "chromium-m88/chromium.chromiumos"
+      console_ids: "chromium-m88/chromium.memory"
+      console_ids: "chromium-m88/chromium.gpu"
+      console_ids: "chromium-m88/chromium.android"
     }
   }
 }
@@ -2090,65 +2107,65 @@ consoles {
   id: "chromium.dawn"
   name: "chromium.dawn"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4280"
+  refs: "regexp:refs/branch-heads/4324"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Linux x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Linux x64 DEPS Builder"
     category: "DEPS|Linux|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
     category: "DEPS|Linux|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
     category: "DEPS|Linux|Nvidia"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Mac x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Mac x64 DEPS Builder"
     category: "DEPS|Mac|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Mac x64 DEPS Release (AMD)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Mac x64 DEPS Release (AMD)"
     category: "DEPS|Mac|AMD"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Mac x64 DEPS Release (Intel)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Mac x64 DEPS Release (Intel)"
     category: "DEPS|Mac|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x86 DEPS Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x86 DEPS Builder"
     category: "DEPS|Windows|Builder"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x64 DEPS Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x64 DEPS Builder"
     category: "DEPS|Windows|Builder"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
     category: "DEPS|Windows|Intel"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
     category: "DEPS|Windows|Intel"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
     category: "DEPS|Windows|Nvidia"
     short_name: "x86"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
     category: "DEPS|Windows|Nvidia"
     short_name: "x64"
   }
@@ -2197,7 +2214,7 @@ consoles {
       name: "Chromium"
       links {
         text: "source"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324"
         alt: "Chromium source code repository"
       }
       links {
@@ -2230,27 +2247,27 @@ consoles {
       name: "Consoles"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/chromium.android"
+        url: "/p/chromium-m88/g/chromium.android"
         alt: "Chromium Android console"
       }
       links {
         text: "dawn"
-        url: "/p/chromium-m87/g/chromium.dawn"
+        url: "/p/chromium-m88/g/chromium.dawn"
         alt: "Chromium Dawn console"
       }
       links {
         text: "fyi"
-        url: "/p/chromium-m87/g/chromium.fyi"
+        url: "/p/chromium-m88/g/chromium.fyi"
         alt: "Chromium FYI console"
       }
       links {
         text: "gpu"
-        url: "/p/chromium-m87/g/chromium.gpu"
+        url: "/p/chromium-m88/g/chromium.gpu"
         alt: "Chromium GPU console"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/chromium.chromiumos"
+        url: "/p/chromium-m88/g/chromium.chromiumos"
         alt: "ChromiumOS console"
       }
     }
@@ -2266,32 +2283,32 @@ consoles {
       name: "Tryservers"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/tryserver.chromium.android/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.android/builders"
         alt: "Android"
       }
       links {
         text: "blink"
-        url: "/p/chromium-m87/g/tryserver.blink/builders"
+        url: "/p/chromium-m88/g/tryserver.blink/builders"
         alt: "Blink"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/tryserver.chromium.chromiumos/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
       }
       links {
         text: "linux"
-        url: "/p/chromium-m87/g/tryserver.chromium.linux/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.linux/builders"
         alt: "Linux"
       }
       links {
         text: "mac"
-        url: "/p/chromium-m87/g/tryserver.chromium.mac/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.mac/builders"
         alt: "Mac"
       }
       links {
         text: "win"
-        url: "/p/chromium-m87/g/tryserver.chromium.win/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.win/builders"
         alt: "Win"
       }
     }
@@ -2304,19 +2321,19 @@ consoles {
       }
       links {
         text: "customize"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280/infra/config/generated/luci-milo.cfg"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324/infra/config/generated/luci-milo.cfg"
         alt: "Customize this console"
       }
     }
     console_groups {
-      console_ids: "chromium-m87/chromium"
-      console_ids: "chromium-m87/chromium.win"
-      console_ids: "chromium-m87/chromium.mac"
-      console_ids: "chromium-m87/chromium.linux"
-      console_ids: "chromium-m87/chromium.chromiumos"
-      console_ids: "chromium-m87/chromium.memory"
-      console_ids: "chromium-m87/chromium.gpu"
-      console_ids: "chromium-m87/chromium.android"
+      console_ids: "chromium-m88/chromium"
+      console_ids: "chromium-m88/chromium.win"
+      console_ids: "chromium-m88/chromium.mac"
+      console_ids: "chromium-m88/chromium.linux"
+      console_ids: "chromium-m88/chromium.chromiumos"
+      console_ids: "chromium-m88/chromium.memory"
+      console_ids: "chromium-m88/chromium.gpu"
+      console_ids: "chromium-m88/chromium.android"
     }
   }
 }
@@ -2324,33 +2341,33 @@ consoles {
   id: "chromium.fyi"
   name: "chromium.fyi"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4280"
+  refs: "regexp:refs/branch-heads/4324"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/ios-simulator-cronet"
+    name: "buildbucket/luci.chromium-m88.ci/ios-simulator-cronet"
     category: "cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/VR Linux"
+    name: "buildbucket/luci.chromium-m88.ci/VR Linux"
     category: "linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Ozone Tester (Headless)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Ozone Tester (Headless)"
     category: "linux"
     short_name: "loh"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Ozone Tester (Wayland)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Ozone Tester (Wayland)"
     category: "linux"
     short_name: "low"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Ozone Tester (X11)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Ozone Tester (X11)"
     category: "linux"
     short_name: "lox"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/linux-official"
+    name: "buildbucket/luci.chromium-m88.ci/linux-official"
     category: "linux"
     short_name: "off"
   }
@@ -2399,7 +2416,7 @@ consoles {
       name: "Chromium"
       links {
         text: "source"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324"
         alt: "Chromium source code repository"
       }
       links {
@@ -2432,27 +2449,27 @@ consoles {
       name: "Consoles"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/chromium.android"
+        url: "/p/chromium-m88/g/chromium.android"
         alt: "Chromium Android console"
       }
       links {
         text: "dawn"
-        url: "/p/chromium-m87/g/chromium.dawn"
+        url: "/p/chromium-m88/g/chromium.dawn"
         alt: "Chromium Dawn console"
       }
       links {
         text: "fyi"
-        url: "/p/chromium-m87/g/chromium.fyi"
+        url: "/p/chromium-m88/g/chromium.fyi"
         alt: "Chromium FYI console"
       }
       links {
         text: "gpu"
-        url: "/p/chromium-m87/g/chromium.gpu"
+        url: "/p/chromium-m88/g/chromium.gpu"
         alt: "Chromium GPU console"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/chromium.chromiumos"
+        url: "/p/chromium-m88/g/chromium.chromiumos"
         alt: "ChromiumOS console"
       }
     }
@@ -2468,32 +2485,32 @@ consoles {
       name: "Tryservers"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/tryserver.chromium.android/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.android/builders"
         alt: "Android"
       }
       links {
         text: "blink"
-        url: "/p/chromium-m87/g/tryserver.blink/builders"
+        url: "/p/chromium-m88/g/tryserver.blink/builders"
         alt: "Blink"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/tryserver.chromium.chromiumos/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
       }
       links {
         text: "linux"
-        url: "/p/chromium-m87/g/tryserver.chromium.linux/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.linux/builders"
         alt: "Linux"
       }
       links {
         text: "mac"
-        url: "/p/chromium-m87/g/tryserver.chromium.mac/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.mac/builders"
         alt: "Mac"
       }
       links {
         text: "win"
-        url: "/p/chromium-m87/g/tryserver.chromium.win/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.win/builders"
         alt: "Win"
       }
     }
@@ -2506,19 +2523,19 @@ consoles {
       }
       links {
         text: "customize"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280/infra/config/generated/luci-milo.cfg"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324/infra/config/generated/luci-milo.cfg"
         alt: "Customize this console"
       }
     }
     console_groups {
-      console_ids: "chromium-m87/chromium"
-      console_ids: "chromium-m87/chromium.win"
-      console_ids: "chromium-m87/chromium.mac"
-      console_ids: "chromium-m87/chromium.linux"
-      console_ids: "chromium-m87/chromium.chromiumos"
-      console_ids: "chromium-m87/chromium.memory"
-      console_ids: "chromium-m87/chromium.gpu"
-      console_ids: "chromium-m87/chromium.android"
+      console_ids: "chromium-m88/chromium"
+      console_ids: "chromium-m88/chromium.win"
+      console_ids: "chromium-m88/chromium.mac"
+      console_ids: "chromium-m88/chromium.linux"
+      console_ids: "chromium-m88/chromium.chromiumos"
+      console_ids: "chromium-m88/chromium.memory"
+      console_ids: "chromium-m88/chromium.gpu"
+      console_ids: "chromium-m88/chromium.android"
     }
   }
 }
@@ -2526,38 +2543,38 @@ consoles {
   id: "chromium.gpu"
   name: "chromium.gpu"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4280"
+  refs: "regexp:refs/branch-heads/4324"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/GPU Win x64 Builder"
+    name: "buildbucket/luci.chromium-m88.ci/GPU Win x64 Builder"
     category: "Windows"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win10 x64 Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Win10 x64 Release (NVIDIA)"
     category: "Windows"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/GPU Mac Builder"
+    name: "buildbucket/luci.chromium-m88.ci/GPU Mac Builder"
     category: "Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac Release (Intel)"
+    name: "buildbucket/luci.chromium-m88.ci/Mac Release (Intel)"
     category: "Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac Retina Release (AMD)"
+    name: "buildbucket/luci.chromium-m88.ci/Mac Retina Release (AMD)"
     category: "Mac"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/GPU Linux Builder"
+    name: "buildbucket/luci.chromium-m88.ci/GPU Linux Builder"
     category: "Linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Release (NVIDIA)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Release (NVIDIA)"
     category: "Linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Android Release (Nexus 5X)"
+    name: "buildbucket/luci.chromium-m88.ci/Android Release (Nexus 5X)"
     category: "Android"
   }
   header {
@@ -2605,7 +2622,7 @@ consoles {
       name: "Chromium"
       links {
         text: "source"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324"
         alt: "Chromium source code repository"
       }
       links {
@@ -2638,27 +2655,27 @@ consoles {
       name: "Consoles"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/chromium.android"
+        url: "/p/chromium-m88/g/chromium.android"
         alt: "Chromium Android console"
       }
       links {
         text: "dawn"
-        url: "/p/chromium-m87/g/chromium.dawn"
+        url: "/p/chromium-m88/g/chromium.dawn"
         alt: "Chromium Dawn console"
       }
       links {
         text: "fyi"
-        url: "/p/chromium-m87/g/chromium.fyi"
+        url: "/p/chromium-m88/g/chromium.fyi"
         alt: "Chromium FYI console"
       }
       links {
         text: "gpu"
-        url: "/p/chromium-m87/g/chromium.gpu"
+        url: "/p/chromium-m88/g/chromium.gpu"
         alt: "Chromium GPU console"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/chromium.chromiumos"
+        url: "/p/chromium-m88/g/chromium.chromiumos"
         alt: "ChromiumOS console"
       }
     }
@@ -2674,32 +2691,32 @@ consoles {
       name: "Tryservers"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/tryserver.chromium.android/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.android/builders"
         alt: "Android"
       }
       links {
         text: "blink"
-        url: "/p/chromium-m87/g/tryserver.blink/builders"
+        url: "/p/chromium-m88/g/tryserver.blink/builders"
         alt: "Blink"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/tryserver.chromium.chromiumos/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
       }
       links {
         text: "linux"
-        url: "/p/chromium-m87/g/tryserver.chromium.linux/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.linux/builders"
         alt: "Linux"
       }
       links {
         text: "mac"
-        url: "/p/chromium-m87/g/tryserver.chromium.mac/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.mac/builders"
         alt: "Mac"
       }
       links {
         text: "win"
-        url: "/p/chromium-m87/g/tryserver.chromium.win/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.win/builders"
         alt: "Win"
       }
     }
@@ -2712,19 +2729,19 @@ consoles {
       }
       links {
         text: "customize"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280/infra/config/generated/luci-milo.cfg"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324/infra/config/generated/luci-milo.cfg"
         alt: "Customize this console"
       }
     }
     console_groups {
-      console_ids: "chromium-m87/chromium"
-      console_ids: "chromium-m87/chromium.win"
-      console_ids: "chromium-m87/chromium.mac"
-      console_ids: "chromium-m87/chromium.linux"
-      console_ids: "chromium-m87/chromium.chromiumos"
-      console_ids: "chromium-m87/chromium.memory"
-      console_ids: "chromium-m87/chromium.gpu"
-      console_ids: "chromium-m87/chromium.android"
+      console_ids: "chromium-m88/chromium"
+      console_ids: "chromium-m88/chromium.win"
+      console_ids: "chromium-m88/chromium.mac"
+      console_ids: "chromium-m88/chromium.linux"
+      console_ids: "chromium-m88/chromium.chromiumos"
+      console_ids: "chromium-m88/chromium.memory"
+      console_ids: "chromium-m88/chromium.gpu"
+      console_ids: "chromium-m88/chromium.android"
     }
   }
 }
@@ -2732,70 +2749,70 @@ consoles {
   id: "chromium.linux"
   name: "chromium.linux"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4280"
+  refs: "regexp:refs/branch-heads/4324"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Builder"
     category: "release"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tests"
     category: "release"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/linux-ozone-rel"
+    name: "buildbucket/luci.chromium-m88.ci/linux-ozone-rel"
     category: "release"
     short_name: "ozo"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tester (Ozone Headless)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tester (Ozone Headless)"
     category: "release|ozone"
     short_name: "ltoh"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tester (Ozone Wayland)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tester (Ozone Wayland)"
     category: "release|ozone"
     short_name: "ltow"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tester (Ozone X11)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tester (Ozone X11)"
     category: "release|ozone"
     short_name: "ltox"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Builder (dbg)"
     category: "debug|builder"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux Tests (dbg)(1)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux Tests (dbg)(1)"
     category: "debug|tester"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Cast Linux"
+    name: "buildbucket/luci.chromium-m88.ci/Cast Linux"
     category: "cast"
     short_name: "vid"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Fuchsia ARM64"
+    name: "buildbucket/luci.chromium-m88.ci/Fuchsia ARM64"
     category: "fuchsia|a64"
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/fuchsia-arm64-cast"
+    name: "buildbucket/luci.chromium-m88.ci/fuchsia-arm64-cast"
     category: "fuchsia|cast"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/fuchsia-x64-cast"
+    name: "buildbucket/luci.chromium-m88.ci/fuchsia-x64-cast"
     category: "fuchsia|cast"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Fuchsia x64"
+    name: "buildbucket/luci.chromium-m88.ci/Fuchsia x64"
     category: "fuchsia|x64"
     short_name: "rel"
   }
@@ -2844,7 +2861,7 @@ consoles {
       name: "Chromium"
       links {
         text: "source"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324"
         alt: "Chromium source code repository"
       }
       links {
@@ -2877,27 +2894,27 @@ consoles {
       name: "Consoles"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/chromium.android"
+        url: "/p/chromium-m88/g/chromium.android"
         alt: "Chromium Android console"
       }
       links {
         text: "dawn"
-        url: "/p/chromium-m87/g/chromium.dawn"
+        url: "/p/chromium-m88/g/chromium.dawn"
         alt: "Chromium Dawn console"
       }
       links {
         text: "fyi"
-        url: "/p/chromium-m87/g/chromium.fyi"
+        url: "/p/chromium-m88/g/chromium.fyi"
         alt: "Chromium FYI console"
       }
       links {
         text: "gpu"
-        url: "/p/chromium-m87/g/chromium.gpu"
+        url: "/p/chromium-m88/g/chromium.gpu"
         alt: "Chromium GPU console"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/chromium.chromiumos"
+        url: "/p/chromium-m88/g/chromium.chromiumos"
         alt: "ChromiumOS console"
       }
     }
@@ -2913,32 +2930,32 @@ consoles {
       name: "Tryservers"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/tryserver.chromium.android/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.android/builders"
         alt: "Android"
       }
       links {
         text: "blink"
-        url: "/p/chromium-m87/g/tryserver.blink/builders"
+        url: "/p/chromium-m88/g/tryserver.blink/builders"
         alt: "Blink"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/tryserver.chromium.chromiumos/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
       }
       links {
         text: "linux"
-        url: "/p/chromium-m87/g/tryserver.chromium.linux/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.linux/builders"
         alt: "Linux"
       }
       links {
         text: "mac"
-        url: "/p/chromium-m87/g/tryserver.chromium.mac/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.mac/builders"
         alt: "Mac"
       }
       links {
         text: "win"
-        url: "/p/chromium-m87/g/tryserver.chromium.win/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.win/builders"
         alt: "Win"
       }
     }
@@ -2951,19 +2968,19 @@ consoles {
       }
       links {
         text: "customize"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280/infra/config/generated/luci-milo.cfg"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324/infra/config/generated/luci-milo.cfg"
         alt: "Customize this console"
       }
     }
     console_groups {
-      console_ids: "chromium-m87/chromium"
-      console_ids: "chromium-m87/chromium.win"
-      console_ids: "chromium-m87/chromium.mac"
-      console_ids: "chromium-m87/chromium.linux"
-      console_ids: "chromium-m87/chromium.chromiumos"
-      console_ids: "chromium-m87/chromium.memory"
-      console_ids: "chromium-m87/chromium.gpu"
-      console_ids: "chromium-m87/chromium.android"
+      console_ids: "chromium-m88/chromium"
+      console_ids: "chromium-m88/chromium.win"
+      console_ids: "chromium-m88/chromium.mac"
+      console_ids: "chromium-m88/chromium.linux"
+      console_ids: "chromium-m88/chromium.chromiumos"
+      console_ids: "chromium-m88/chromium.memory"
+      console_ids: "chromium-m88/chromium.gpu"
+      console_ids: "chromium-m88/chromium.android"
     }
   }
 }
@@ -2971,65 +2988,60 @@ consoles {
   id: "chromium.mac"
   name: "chromium.mac"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4280"
+  refs: "regexp:refs/branch-heads/4324"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Mac Builder"
     category: "release"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.10 Tests"
-    category: "release"
-    short_name: "10"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.11 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.11 Tests"
     category: "release"
     short_name: "11"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.12 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.12 Tests"
     category: "release"
     short_name: "12"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.13 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.13 Tests"
     category: "release"
     short_name: "13"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.14 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.14 Tests"
     category: "release"
     short_name: "14"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.15 Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.15 Tests"
     category: "release"
     short_name: "15"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/mac-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.ci/mac-arm64-rel"
     category: "release|arm64"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Mac Builder (dbg)"
     category: "debug"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Mac10.13 Tests (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Mac10.13 Tests (dbg)"
     category: "debug"
     short_name: "13"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/ios-simulator"
+    name: "buildbucket/luci.chromium-m88.ci/ios-simulator"
     category: "ios|default"
     short_name: "sim"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/ios-simulator-full-configs"
+    name: "buildbucket/luci.chromium-m88.ci/ios-simulator-full-configs"
     category: "ios|default"
     short_name: "ful"
   }
@@ -3078,7 +3090,7 @@ consoles {
       name: "Chromium"
       links {
         text: "source"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324"
         alt: "Chromium source code repository"
       }
       links {
@@ -3111,27 +3123,27 @@ consoles {
       name: "Consoles"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/chromium.android"
+        url: "/p/chromium-m88/g/chromium.android"
         alt: "Chromium Android console"
       }
       links {
         text: "dawn"
-        url: "/p/chromium-m87/g/chromium.dawn"
+        url: "/p/chromium-m88/g/chromium.dawn"
         alt: "Chromium Dawn console"
       }
       links {
         text: "fyi"
-        url: "/p/chromium-m87/g/chromium.fyi"
+        url: "/p/chromium-m88/g/chromium.fyi"
         alt: "Chromium FYI console"
       }
       links {
         text: "gpu"
-        url: "/p/chromium-m87/g/chromium.gpu"
+        url: "/p/chromium-m88/g/chromium.gpu"
         alt: "Chromium GPU console"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/chromium.chromiumos"
+        url: "/p/chromium-m88/g/chromium.chromiumos"
         alt: "ChromiumOS console"
       }
     }
@@ -3147,32 +3159,32 @@ consoles {
       name: "Tryservers"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/tryserver.chromium.android/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.android/builders"
         alt: "Android"
       }
       links {
         text: "blink"
-        url: "/p/chromium-m87/g/tryserver.blink/builders"
+        url: "/p/chromium-m88/g/tryserver.blink/builders"
         alt: "Blink"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/tryserver.chromium.chromiumos/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
       }
       links {
         text: "linux"
-        url: "/p/chromium-m87/g/tryserver.chromium.linux/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.linux/builders"
         alt: "Linux"
       }
       links {
         text: "mac"
-        url: "/p/chromium-m87/g/tryserver.chromium.mac/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.mac/builders"
         alt: "Mac"
       }
       links {
         text: "win"
-        url: "/p/chromium-m87/g/tryserver.chromium.win/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.win/builders"
         alt: "Win"
       }
     }
@@ -3185,19 +3197,19 @@ consoles {
       }
       links {
         text: "customize"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280/infra/config/generated/luci-milo.cfg"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324/infra/config/generated/luci-milo.cfg"
         alt: "Customize this console"
       }
     }
     console_groups {
-      console_ids: "chromium-m87/chromium"
-      console_ids: "chromium-m87/chromium.win"
-      console_ids: "chromium-m87/chromium.mac"
-      console_ids: "chromium-m87/chromium.linux"
-      console_ids: "chromium-m87/chromium.chromiumos"
-      console_ids: "chromium-m87/chromium.memory"
-      console_ids: "chromium-m87/chromium.gpu"
-      console_ids: "chromium-m87/chromium.android"
+      console_ids: "chromium-m88/chromium"
+      console_ids: "chromium-m88/chromium.win"
+      console_ids: "chromium-m88/chromium.mac"
+      console_ids: "chromium-m88/chromium.linux"
+      console_ids: "chromium-m88/chromium.chromiumos"
+      console_ids: "chromium-m88/chromium.memory"
+      console_ids: "chromium-m88/chromium.gpu"
+      console_ids: "chromium-m88/chromium.android"
     }
   }
 }
@@ -3205,30 +3217,30 @@ consoles {
   id: "chromium.memory"
   name: "chromium.memory"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4280"
+  refs: "regexp:refs/branch-heads/4324"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux TSan Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Linux TSan Builder"
     category: "linux|TSan v2"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux TSan Tests"
+    name: "buildbucket/luci.chromium-m88.ci/Linux TSan Tests"
     category: "linux|TSan v2"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux ASan LSan Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Linux ASan LSan Builder"
     category: "linux|asan lsan"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux ASan LSan Tests (1)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux ASan LSan Tests (1)"
     category: "linux|asan lsan"
     short_name: "tst"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Linux ASan Tests (sandboxed)"
+    name: "buildbucket/luci.chromium-m88.ci/Linux ASan Tests (sandboxed)"
     category: "linux|asan lsan"
     short_name: "sbx"
   }
@@ -3277,7 +3289,7 @@ consoles {
       name: "Chromium"
       links {
         text: "source"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324"
         alt: "Chromium source code repository"
       }
       links {
@@ -3310,27 +3322,27 @@ consoles {
       name: "Consoles"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/chromium.android"
+        url: "/p/chromium-m88/g/chromium.android"
         alt: "Chromium Android console"
       }
       links {
         text: "dawn"
-        url: "/p/chromium-m87/g/chromium.dawn"
+        url: "/p/chromium-m88/g/chromium.dawn"
         alt: "Chromium Dawn console"
       }
       links {
         text: "fyi"
-        url: "/p/chromium-m87/g/chromium.fyi"
+        url: "/p/chromium-m88/g/chromium.fyi"
         alt: "Chromium FYI console"
       }
       links {
         text: "gpu"
-        url: "/p/chromium-m87/g/chromium.gpu"
+        url: "/p/chromium-m88/g/chromium.gpu"
         alt: "Chromium GPU console"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/chromium.chromiumos"
+        url: "/p/chromium-m88/g/chromium.chromiumos"
         alt: "ChromiumOS console"
       }
     }
@@ -3346,32 +3358,32 @@ consoles {
       name: "Tryservers"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/tryserver.chromium.android/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.android/builders"
         alt: "Android"
       }
       links {
         text: "blink"
-        url: "/p/chromium-m87/g/tryserver.blink/builders"
+        url: "/p/chromium-m88/g/tryserver.blink/builders"
         alt: "Blink"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/tryserver.chromium.chromiumos/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
       }
       links {
         text: "linux"
-        url: "/p/chromium-m87/g/tryserver.chromium.linux/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.linux/builders"
         alt: "Linux"
       }
       links {
         text: "mac"
-        url: "/p/chromium-m87/g/tryserver.chromium.mac/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.mac/builders"
         alt: "Mac"
       }
       links {
         text: "win"
-        url: "/p/chromium-m87/g/tryserver.chromium.win/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.win/builders"
         alt: "Win"
       }
     }
@@ -3384,19 +3396,19 @@ consoles {
       }
       links {
         text: "customize"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280/infra/config/generated/luci-milo.cfg"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324/infra/config/generated/luci-milo.cfg"
         alt: "Customize this console"
       }
     }
     console_groups {
-      console_ids: "chromium-m87/chromium"
-      console_ids: "chromium-m87/chromium.win"
-      console_ids: "chromium-m87/chromium.mac"
-      console_ids: "chromium-m87/chromium.linux"
-      console_ids: "chromium-m87/chromium.chromiumos"
-      console_ids: "chromium-m87/chromium.memory"
-      console_ids: "chromium-m87/chromium.gpu"
-      console_ids: "chromium-m87/chromium.android"
+      console_ids: "chromium-m88/chromium"
+      console_ids: "chromium-m88/chromium.win"
+      console_ids: "chromium-m88/chromium.mac"
+      console_ids: "chromium-m88/chromium.linux"
+      console_ids: "chromium-m88/chromium.chromiumos"
+      console_ids: "chromium-m88/chromium.memory"
+      console_ids: "chromium-m88/chromium.gpu"
+      console_ids: "chromium-m88/chromium.android"
     }
   }
 }
@@ -3404,30 +3416,30 @@ consoles {
   id: "chromium.win"
   name: "chromium.win"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4280"
+  refs: "regexp:refs/branch-heads/4324"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win x64 Builder"
+    name: "buildbucket/luci.chromium-m88.ci/Win x64 Builder"
     category: "release|builder"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win 7 Tests x64 (1)"
+    name: "buildbucket/luci.chromium-m88.ci/Win 7 Tests x64 (1)"
     category: "release|tester"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win10 Tests x64"
+    name: "buildbucket/luci.chromium-m88.ci/Win10 Tests x64"
     category: "release|tester"
     short_name: "w10"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win Builder (dbg)"
+    name: "buildbucket/luci.chromium-m88.ci/Win Builder (dbg)"
     category: "debug|builder"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.ci/Win7 Tests (dbg)(1)"
+    name: "buildbucket/luci.chromium-m88.ci/Win7 Tests (dbg)(1)"
     category: "debug|tester"
     short_name: "7"
   }
@@ -3476,7 +3488,7 @@ consoles {
       name: "Chromium"
       links {
         text: "source"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324"
         alt: "Chromium source code repository"
       }
       links {
@@ -3509,27 +3521,27 @@ consoles {
       name: "Consoles"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/chromium.android"
+        url: "/p/chromium-m88/g/chromium.android"
         alt: "Chromium Android console"
       }
       links {
         text: "dawn"
-        url: "/p/chromium-m87/g/chromium.dawn"
+        url: "/p/chromium-m88/g/chromium.dawn"
         alt: "Chromium Dawn console"
       }
       links {
         text: "fyi"
-        url: "/p/chromium-m87/g/chromium.fyi"
+        url: "/p/chromium-m88/g/chromium.fyi"
         alt: "Chromium FYI console"
       }
       links {
         text: "gpu"
-        url: "/p/chromium-m87/g/chromium.gpu"
+        url: "/p/chromium-m88/g/chromium.gpu"
         alt: "Chromium GPU console"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/chromium.chromiumos"
+        url: "/p/chromium-m88/g/chromium.chromiumos"
         alt: "ChromiumOS console"
       }
     }
@@ -3545,32 +3557,32 @@ consoles {
       name: "Tryservers"
       links {
         text: "android"
-        url: "/p/chromium-m87/g/tryserver.chromium.android/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.android/builders"
         alt: "Android"
       }
       links {
         text: "blink"
-        url: "/p/chromium-m87/g/tryserver.blink/builders"
+        url: "/p/chromium-m88/g/tryserver.blink/builders"
         alt: "Blink"
       }
       links {
         text: "chromiumos"
-        url: "/p/chromium-m87/g/tryserver.chromium.chromiumos/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
       }
       links {
         text: "linux"
-        url: "/p/chromium-m87/g/tryserver.chromium.linux/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.linux/builders"
         alt: "Linux"
       }
       links {
         text: "mac"
-        url: "/p/chromium-m87/g/tryserver.chromium.mac/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.mac/builders"
         alt: "Mac"
       }
       links {
         text: "win"
-        url: "/p/chromium-m87/g/tryserver.chromium.win/builders"
+        url: "/p/chromium-m88/g/tryserver.chromium.win/builders"
         alt: "Win"
       }
     }
@@ -3583,19 +3595,19 @@ consoles {
       }
       links {
         text: "customize"
-        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4280/infra/config/generated/luci-milo.cfg"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/branch-heads/4324/infra/config/generated/luci-milo.cfg"
         alt: "Customize this console"
       }
     }
     console_groups {
-      console_ids: "chromium-m87/chromium"
-      console_ids: "chromium-m87/chromium.win"
-      console_ids: "chromium-m87/chromium.mac"
-      console_ids: "chromium-m87/chromium.linux"
-      console_ids: "chromium-m87/chromium.chromiumos"
-      console_ids: "chromium-m87/chromium.memory"
-      console_ids: "chromium-m87/chromium.gpu"
-      console_ids: "chromium-m87/chromium.android"
+      console_ids: "chromium-m88/chromium"
+      console_ids: "chromium-m88/chromium.win"
+      console_ids: "chromium-m88/chromium.mac"
+      console_ids: "chromium-m88/chromium.linux"
+      console_ids: "chromium-m88/chromium.chromiumos"
+      console_ids: "chromium-m88/chromium.memory"
+      console_ids: "chromium-m88/chromium.gpu"
+      console_ids: "chromium-m88/chromium.android"
     }
   }
 }
@@ -3603,184 +3615,181 @@ consoles {
   id: "luci.chromium.try"
   name: "luci.chromium.try"
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-binary-size"
+    name: "buildbucket/luci.chromium-m88.try/android-binary-size"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-cronet-arm-dbg"
+    name: "buildbucket/luci.chromium-m88.try/android-cronet-arm-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-lollipop-arm-rel"
+    name: "buildbucket/luci.chromium-m88.try/android-lollipop-arm-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-marshmallow-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.try/android-marshmallow-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-marshmallow-x86-rel"
+    name: "buildbucket/luci.chromium-m88.try/android-marshmallow-x86-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-official"
+    name: "buildbucket/luci.chromium-m88.try/android-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-pie-arm64-dbg"
+    name: "buildbucket/luci.chromium-m88.try/android-pie-arm64-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-pie-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.try/android-pie-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_compile_dbg"
+    name: "buildbucket/luci.chromium-m88.try/android_compile_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_compile_x64_dbg"
+    name: "buildbucket/luci.chromium-m88.try/android_compile_x64_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_compile_x86_dbg"
+    name: "buildbucket/luci.chromium-m88.try/android_compile_x86_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_cronet"
+    name: "buildbucket/luci.chromium-m88.try/android_cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m88.try/android_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/cast_shell_android"
+    name: "buildbucket/luci.chromium-m88.try/cast_shell_android"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/cast_shell_linux"
+    name: "buildbucket/luci.chromium-m88.try/cast_shell_linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/chromeos-amd64-generic-dbg"
+    name: "buildbucket/luci.chromium-m88.try/chromeos-amd64-generic-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/chromeos-amd64-generic-rel"
+    name: "buildbucket/luci.chromium-m88.try/chromeos-amd64-generic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/chromeos-arm-generic-rel"
+    name: "buildbucket/luci.chromium-m88.try/chromeos-arm-generic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/chromeos-kevin-rel"
+    name: "buildbucket/luci.chromium-m88.try/chromeos-kevin-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/chromium_presubmit"
+    name: "buildbucket/luci.chromium-m88.try/chromium_presubmit"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/closure_compilation"
+    name: "buildbucket/luci.chromium-m88.try/dawn-linux-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/dawn-linux-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m88.try/dawn-mac-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/dawn-mac-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m88.try/dawn-win10-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/dawn-win10-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m88.try/dawn-win10-x86-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/dawn-win10-x86-deps-rel"
+    name: "buildbucket/luci.chromium-m88.try/fuchsia-arm64-cast"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/fuchsia-arm64-cast"
+    name: "buildbucket/luci.chromium-m88.try/fuchsia-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/fuchsia-official"
+    name: "buildbucket/luci.chromium-m88.try/fuchsia-x64-cast"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/fuchsia-x64-cast"
+    name: "buildbucket/luci.chromium-m88.try/fuchsia_arm64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/fuchsia_arm64"
+    name: "buildbucket/luci.chromium-m88.try/fuchsia_x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/fuchsia_x64"
+    name: "buildbucket/luci.chromium-m88.try/ios-simulator"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/ios-simulator"
+    name: "buildbucket/luci.chromium-m88.try/ios-simulator-cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/ios-simulator-cronet"
+    name: "buildbucket/luci.chromium-m88.try/ios-simulator-full-configs"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/ios-simulator-full-configs"
+    name: "buildbucket/luci.chromium-m88.try/linux-blink-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-blink-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux-chromeos-compile-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-chromeos-compile-dbg"
+    name: "buildbucket/luci.chromium-m88.try/linux-chromeos-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-chromeos-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux-libfuzzer-asan-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-libfuzzer-asan-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-official"
+    name: "buildbucket/luci.chromium-m88.try/linux-ozone-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-ozone-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux_chromium_asan_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_chromium_asan_rel_ng"
+    name: "buildbucket/luci.chromium-m88.try/linux_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m88.try/linux_chromium_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_chromium_dbg_ng"
+    name: "buildbucket/luci.chromium-m88.try/linux_chromium_tsan_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_chromium_tsan_rel_ng"
+    name: "buildbucket/luci.chromium-m88.try/linux_layout_tests_composite_after_paint"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_layout_tests_composite_after_paint"
+    name: "buildbucket/luci.chromium-m88.try/linux_layout_tests_layout_ng_disabled"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_layout_tests_layout_ng_disabled"
+    name: "buildbucket/luci.chromium-m88.try/linux_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m88.try/linux_vr"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_vr"
+    name: "buildbucket/luci.chromium-m88.try/mac-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/mac-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.try/mac-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/mac-official"
+    name: "buildbucket/luci.chromium-m88.try/mac-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/mac-rel"
+    name: "buildbucket/luci.chromium-m88.try/mac_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/mac_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m88.try/mac_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/mac_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m88.try/win-libfuzzer-asan-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win-libfuzzer-asan-rel"
+    name: "buildbucket/luci.chromium-m88.try/win-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win-official"
+    name: "buildbucket/luci.chromium-m88.try/win10_chromium_x64_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win10_chromium_x64_rel_ng"
+    name: "buildbucket/luci.chromium-m88.try/win32-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win32-official"
+    name: "buildbucket/luci.chromium-m88.try/win7-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win7-rel"
+    name: "buildbucket/luci.chromium-m88.try/win_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win_chromium_compile_dbg_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m87.try/win_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m88.try/win_optional_gpu_tests_rel"
   }
   builder_view_only: true
 }
@@ -3788,7 +3797,7 @@ consoles {
   id: "tryserver.blink"
   name: "tryserver.blink"
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-blink-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux-blink-rel"
   }
   builder_view_only: true
 }
@@ -3796,22 +3805,22 @@ consoles {
   id: "tryserver.chromium"
   name: "tryserver.chromium"
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-official"
+    name: "buildbucket/luci.chromium-m88.try/android-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/fuchsia-official"
+    name: "buildbucket/luci.chromium-m88.try/fuchsia-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-official"
+    name: "buildbucket/luci.chromium-m88.try/linux-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/mac-official"
+    name: "buildbucket/luci.chromium-m88.try/mac-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win-official"
+    name: "buildbucket/luci.chromium-m88.try/win-official"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win32-official"
+    name: "buildbucket/luci.chromium-m88.try/win32-official"
   }
   builder_view_only: true
 }
@@ -3819,43 +3828,43 @@ consoles {
   id: "tryserver.chromium.android"
   name: "tryserver.chromium.android"
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-binary-size"
+    name: "buildbucket/luci.chromium-m88.try/android-binary-size"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-cronet-arm-dbg"
+    name: "buildbucket/luci.chromium-m88.try/android-cronet-arm-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-lollipop-arm-rel"
+    name: "buildbucket/luci.chromium-m88.try/android-lollipop-arm-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-marshmallow-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.try/android-marshmallow-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-marshmallow-x86-rel"
+    name: "buildbucket/luci.chromium-m88.try/android-marshmallow-x86-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-pie-arm64-dbg"
+    name: "buildbucket/luci.chromium-m88.try/android-pie-arm64-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android-pie-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.try/android-pie-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_compile_dbg"
+    name: "buildbucket/luci.chromium-m88.try/android_compile_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_compile_x64_dbg"
+    name: "buildbucket/luci.chromium-m88.try/android_compile_x64_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_compile_x86_dbg"
+    name: "buildbucket/luci.chromium-m88.try/android_compile_x86_dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_cronet"
+    name: "buildbucket/luci.chromium-m88.try/android_cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/android_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m88.try/android_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/cast_shell_android"
+    name: "buildbucket/luci.chromium-m88.try/cast_shell_android"
   }
   builder_view_only: true
 }
@@ -3863,22 +3872,22 @@ consoles {
   id: "tryserver.chromium.chromiumos"
   name: "tryserver.chromium.chromiumos"
   builders {
-    name: "buildbucket/luci.chromium-m87.try/chromeos-amd64-generic-dbg"
+    name: "buildbucket/luci.chromium-m88.try/chromeos-amd64-generic-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/chromeos-amd64-generic-rel"
+    name: "buildbucket/luci.chromium-m88.try/chromeos-amd64-generic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/chromeos-arm-generic-rel"
+    name: "buildbucket/luci.chromium-m88.try/chromeos-arm-generic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/chromeos-kevin-rel"
+    name: "buildbucket/luci.chromium-m88.try/chromeos-kevin-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-chromeos-compile-dbg"
+    name: "buildbucket/luci.chromium-m88.try/linux-chromeos-compile-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-chromeos-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux-chromeos-rel"
   }
   builder_view_only: true
 }
@@ -3886,16 +3895,16 @@ consoles {
   id: "tryserver.chromium.dawn"
   name: "tryserver.chromium.dawn"
   builders {
-    name: "buildbucket/luci.chromium-m87.try/dawn-linux-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m88.try/dawn-linux-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/dawn-mac-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m88.try/dawn-mac-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/dawn-win10-x64-deps-rel"
+    name: "buildbucket/luci.chromium-m88.try/dawn-win10-x64-deps-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/dawn-win10-x86-deps-rel"
+    name: "buildbucket/luci.chromium-m88.try/dawn-win10-x86-deps-rel"
   }
   builder_view_only: true
 }
@@ -3903,58 +3912,55 @@ consoles {
   id: "tryserver.chromium.linux"
   name: "tryserver.chromium.linux"
   builders {
-    name: "buildbucket/luci.chromium-m87.try/cast_shell_linux"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m87.try/chromium_presubmit"
+    name: "buildbucket/luci.chromium-m88.try/cast_shell_linux"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/closure_compilation"
+    name: "buildbucket/luci.chromium-m88.try/chromium_presubmit"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/fuchsia-arm64-cast"
+    name: "buildbucket/luci.chromium-m88.try/fuchsia-arm64-cast"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/fuchsia-x64-cast"
+    name: "buildbucket/luci.chromium-m88.try/fuchsia-x64-cast"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/fuchsia_arm64"
+    name: "buildbucket/luci.chromium-m88.try/fuchsia_arm64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/fuchsia_x64"
+    name: "buildbucket/luci.chromium-m88.try/fuchsia_x64"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-libfuzzer-asan-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux-libfuzzer-asan-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-ozone-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux-ozone-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux-rel"
+    name: "buildbucket/luci.chromium-m88.try/linux-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_chromium_asan_rel_ng"
+    name: "buildbucket/luci.chromium-m88.try/linux_chromium_asan_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m88.try/linux_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_chromium_dbg_ng"
+    name: "buildbucket/luci.chromium-m88.try/linux_chromium_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_chromium_tsan_rel_ng"
+    name: "buildbucket/luci.chromium-m88.try/linux_chromium_tsan_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_layout_tests_composite_after_paint"
+    name: "buildbucket/luci.chromium-m88.try/linux_layout_tests_composite_after_paint"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_layout_tests_layout_ng_disabled"
+    name: "buildbucket/luci.chromium-m88.try/linux_layout_tests_layout_ng_disabled"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m88.try/linux_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/linux_vr"
+    name: "buildbucket/luci.chromium-m88.try/linux_vr"
   }
   builder_view_only: true
 }
@@ -3962,25 +3968,25 @@ consoles {
   id: "tryserver.chromium.mac"
   name: "tryserver.chromium.mac"
   builders {
-    name: "buildbucket/luci.chromium-m87.try/ios-simulator"
+    name: "buildbucket/luci.chromium-m88.try/ios-simulator"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/ios-simulator-cronet"
+    name: "buildbucket/luci.chromium-m88.try/ios-simulator-cronet"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/ios-simulator-full-configs"
+    name: "buildbucket/luci.chromium-m88.try/ios-simulator-full-configs"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/mac-arm64-rel"
+    name: "buildbucket/luci.chromium-m88.try/mac-arm64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/mac-rel"
+    name: "buildbucket/luci.chromium-m88.try/mac-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/mac_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m88.try/mac_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/mac_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m88.try/mac_optional_gpu_tests_rel"
   }
   builder_view_only: true
 }
@@ -3988,19 +3994,19 @@ consoles {
   id: "tryserver.chromium.win"
   name: "tryserver.chromium.win"
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win-libfuzzer-asan-rel"
+    name: "buildbucket/luci.chromium-m88.try/win-libfuzzer-asan-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win10_chromium_x64_rel_ng"
+    name: "buildbucket/luci.chromium-m88.try/win10_chromium_x64_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win7-rel"
+    name: "buildbucket/luci.chromium-m88.try/win7-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win_chromium_compile_dbg_ng"
+    name: "buildbucket/luci.chromium-m88.try/win_chromium_compile_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium-m87.try/win_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium-m88.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 5ada2a1e8d2..fbd666d8768 100644
--- a/chromium/infra/config/generated/luci-notify.cfg
+++ b/chromium/infra/config/generated/luci-notify.cfg
@@ -460,18 +460,6 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "Mac10.10 Tests"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
     name: "Mac10.11 Tests"
   }
 }
@@ -878,6 +866,19 @@ notifiers {
   notifications {
     on_new_status: INFRA_FAILURE
   }
+  builders {
+    bucket: "ci"
+    name: "linux-lacros-builder-rel"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+  }
+  notifications {
+    on_new_status: INFRA_FAILURE
+  }
   notifications {
     on_new_status: INFRA_FAILURE
   }
diff --git a/chromium/infra/config/generated/luci-scheduler.cfg b/chromium/infra/config/generated/luci-scheduler.cfg
index 531b447c6bf..2b279040a3e 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-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Android Release (Nexus 5X)"
   }
 }
@@ -24,7 +24,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Android WebView M (dbg)"
   }
 }
@@ -38,7 +38,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Android WebView N (dbg)"
   }
 }
@@ -52,7 +52,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Android WebView O (dbg)"
   }
 }
@@ -66,7 +66,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Android WebView P (dbg)"
   }
 }
@@ -76,7 +76,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Android arm Builder (dbg)"
   }
 }
@@ -86,7 +86,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Android arm64 Builder (dbg)"
   }
 }
@@ -96,7 +96,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Android x64 Builder (dbg)"
   }
 }
@@ -106,7 +106,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Android x86 Builder (dbg)"
   }
 }
@@ -116,7 +116,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Cast Android (dbg)"
   }
 }
@@ -126,7 +126,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Cast Linux"
   }
 }
@@ -136,7 +136,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Dawn Linux x64 DEPS Builder"
   }
 }
@@ -150,7 +150,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Dawn Linux x64 DEPS Release (Intel HD 630)"
   }
 }
@@ -164,7 +164,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Dawn Linux x64 DEPS Release (NVIDIA)"
   }
 }
@@ -174,7 +174,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Dawn Mac x64 DEPS Builder"
   }
 }
@@ -188,7 +188,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Dawn Mac x64 DEPS Release (AMD)"
   }
 }
@@ -202,7 +202,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Dawn Mac x64 DEPS Release (Intel)"
   }
 }
@@ -212,7 +212,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Dawn Win10 x64 DEPS Builder"
   }
 }
@@ -226,7 +226,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Dawn Win10 x64 DEPS Release (Intel HD 630)"
   }
 }
@@ -240,7 +240,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Dawn Win10 x64 DEPS Release (NVIDIA)"
   }
 }
@@ -250,7 +250,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Dawn Win10 x86 DEPS Builder"
   }
 }
@@ -264,7 +264,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Dawn Win10 x86 DEPS Release (Intel HD 630)"
   }
 }
@@ -278,7 +278,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Dawn Win10 x86 DEPS Release (NVIDIA)"
   }
 }
@@ -288,7 +288,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Fuchsia ARM64"
   }
 }
@@ -298,7 +298,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Fuchsia x64"
   }
 }
@@ -308,7 +308,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "GPU Linux Builder"
   }
 }
@@ -318,7 +318,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "GPU Mac Builder"
   }
 }
@@ -328,7 +328,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "GPU Win x64 Builder"
   }
 }
@@ -338,7 +338,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux ASan LSan Builder"
   }
 }
@@ -352,7 +352,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux ASan LSan Tests (1)"
   }
 }
@@ -366,7 +366,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux ASan Tests (sandboxed)"
   }
 }
@@ -376,7 +376,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux Builder"
   }
 }
@@ -386,7 +386,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux Builder (dbg)"
   }
 }
@@ -400,7 +400,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux Ozone Tester (Headless)"
   }
 }
@@ -414,7 +414,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux Ozone Tester (Wayland)"
   }
 }
@@ -428,7 +428,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux Ozone Tester (X11)"
   }
 }
@@ -442,7 +442,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux Release (NVIDIA)"
   }
 }
@@ -452,7 +452,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux TSan Builder"
   }
 }
@@ -466,7 +466,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux TSan Tests"
   }
 }
@@ -480,7 +480,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux Tester (Ozone Headless)"
   }
 }
@@ -494,7 +494,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux Tester (Ozone Wayland)"
   }
 }
@@ -508,7 +508,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux Tester (Ozone X11)"
   }
 }
@@ -522,7 +522,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux Tests"
   }
 }
@@ -536,7 +536,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Linux Tests (dbg)(1)"
   }
 }
@@ -546,7 +546,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Mac Builder"
   }
 }
@@ -556,7 +556,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Mac Builder (dbg)"
   }
 }
@@ -570,7 +570,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Mac Release (Intel)"
   }
 }
@@ -584,25 +584,11 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Mac Retina Release (AMD)"
   }
 }
 job {
-  id: "Mac10.10 Tests"
-  realm: "ci"
-  acls {
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  }
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
-    builder: "Mac10.10 Tests"
-  }
-}
-job {
   id: "Mac10.11 Tests"
   realm: "ci"
   acls {
@@ -612,7 +598,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Mac10.11 Tests"
   }
 }
@@ -626,7 +612,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Mac10.12 Tests"
   }
 }
@@ -640,7 +626,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Mac10.13 Tests"
   }
 }
@@ -654,7 +640,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Mac10.13 Tests (dbg)"
   }
 }
@@ -668,7 +654,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Mac10.14 Tests"
   }
 }
@@ -682,7 +668,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Mac10.15 Tests"
   }
 }
@@ -696,7 +682,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Marshmallow 64 bit Tester"
   }
 }
@@ -710,7 +696,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Nougat Phone Tester"
   }
 }
@@ -724,7 +710,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Oreo Phone Tester"
   }
 }
@@ -734,7 +720,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "VR Linux"
   }
 }
@@ -748,7 +734,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Win 7 Tests x64 (1)"
   }
 }
@@ -758,7 +744,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Win Builder (dbg)"
   }
 }
@@ -768,7 +754,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Win x64 Builder"
   }
 }
@@ -782,7 +768,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Win10 Tests x64"
   }
 }
@@ -796,7 +782,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Win10 x64 Release (NVIDIA)"
   }
 }
@@ -810,7 +796,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "Win7 Tests (dbg)(1)"
   }
 }
@@ -820,7 +806,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "android-cronet-arm-dbg"
   }
 }
@@ -830,7 +816,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "android-cronet-arm-rel"
   }
 }
@@ -844,7 +830,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "android-cronet-arm-rel-kitkat-tests"
   }
 }
@@ -858,7 +844,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "android-cronet-arm-rel-lollipop-tests"
   }
 }
@@ -868,7 +854,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "android-lollipop-arm-rel"
   }
 }
@@ -878,7 +864,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "android-marshmallow-arm64-rel"
   }
 }
@@ -888,7 +874,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "android-marshmallow-x86-rel"
   }
 }
@@ -898,7 +884,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "android-nougat-arm64-rel"
   }
 }
@@ -908,7 +894,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "android-official"
   }
 }
@@ -922,7 +908,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "android-pie-arm64-dbg"
   }
 }
@@ -932,7 +918,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "android-pie-arm64-rel"
   }
 }
@@ -942,7 +928,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "chromeos-amd64-generic-dbg"
   }
 }
@@ -952,7 +938,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "chromeos-amd64-generic-lacros-dbg"
   }
 }
@@ -962,7 +948,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "chromeos-amd64-generic-rel"
   }
 }
@@ -972,7 +958,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "chromeos-arm-generic-rel"
   }
 }
@@ -982,7 +968,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "chromeos-kevin-rel"
   }
 }
@@ -992,7 +978,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "fuchsia-arm64-cast"
   }
 }
@@ -1002,7 +988,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "fuchsia-official"
   }
 }
@@ -1012,7 +998,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "fuchsia-x64-cast"
   }
 }
@@ -1022,7 +1008,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "ios-simulator"
   }
 }
@@ -1032,7 +1018,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "ios-simulator-cronet"
   }
 }
@@ -1042,7 +1028,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "ios-simulator-full-configs"
   }
 }
@@ -1052,7 +1038,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "linux-chromeos-dbg"
   }
 }
@@ -1062,17 +1048,41 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "linux-chromeos-rel"
   }
 }
 job {
+  id: "linux-lacros-builder-rel"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium-m88.ci"
+    builder: "linux-lacros-builder-rel"
+  }
+}
+job {
+  id: "linux-lacros-tester-rel"
+  realm: "ci"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium-m88.ci"
+    builder: "linux-lacros-tester-rel"
+  }
+}
+job {
   id: "linux-official"
   realm: "ci"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "linux-official"
   }
 }
@@ -1082,7 +1092,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "linux-ozone-rel"
   }
 }
@@ -1092,7 +1102,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "mac-arm64-rel"
   }
 }
@@ -1102,7 +1112,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "win-official"
   }
 }
@@ -1112,7 +1122,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m87.ci"
+    bucket: "luci.chromium-m88.ci"
     builder: "win32-official"
   }
 }
@@ -1246,6 +1256,7 @@ trigger {
   triggers: "ios-simulator-full-configs"
   triggers: "linux-chromeos-dbg"
   triggers: "linux-chromeos-rel"
+  triggers: "linux-lacros-builder-rel"
   triggers: "linux-official"
   triggers: "linux-ozone-rel"
   triggers: "mac-arm64-rel"
@@ -1253,7 +1264,7 @@ trigger {
   triggers: "win32-official"
   gitiles {
     repo: "https://chromium.googlesource.com/chromium/src"
-    refs: "regexp:refs/branch-heads/4280"
+    refs: "regexp:refs/branch-heads/4324"
   }
 }
 acl_sets {
diff --git a/chromium/infra/config/generated/outages.pyl b/chromium/infra/config/generated/outages.pyl
new file mode 100644
index 00000000000..4a518e71183
--- /dev/null
+++ b/chromium/infra/config/generated/outages.pyl
@@ -0,0 +1,3 @@
+# This is a non-LUCI generated file
+# This details the current configuration modifications for outages settings
+{}
diff --git a/chromium/infra/config/generated/project.cfg b/chromium/infra/config/generated/project.cfg
index ee48007f04e..261d78417b7 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-m87"
+name: "chromium-m88"
 access: "group:all"
diff --git a/chromium/infra/config/generated/realms.cfg b/chromium/infra/config/generated/realms.cfg
index 7910d464f5b..c83636e6dd4 100644
--- a/chromium/infra/config/generated/realms.cfg
+++ b/chromium/infra/config/generated/realms.cfg
@@ -56,6 +56,10 @@ realms {
     role: "role/buildbucket.triggerer"
     principals: "group:project-chromium-ci-schedulers"
   }
+  bindings {
+    role: "role/swarming.taskTriggerer"
+    principals: "user:chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
 }
 realms {
   name: "public"
diff --git a/chromium/infra/config/generated/tricium-prod.cfg b/chromium/infra/config/generated/tricium-prod.cfg
index daa23d9a960..1034e632957 100644
--- a/chromium/infra/config/generated/tricium-prod.cfg
+++ b/chromium/infra/config/generated/tricium-prod.cfg
@@ -6,9 +6,6 @@ acls {
   group: "tricium-chromium-requesters"
 }
 
-# Analyzer definitions
-# These are analyzers that are only applicable to this repository.
-
 functions {
   type: ANALYZER
   name: "ClangTidy"
@@ -51,8 +48,8 @@ functions {
   owner: "isherman@chromium.org"
   monorail_component: "Internals>Metrics>Tricium"
   impls {
-    runtime_platform: UBUNTU
-    provides_for_platform: UBUNTU
+    runtime_platform: LINUX
+    provides_for_platform: LINUX
     recipe {
       project: "chromium"
       bucket: "try"
@@ -62,7 +59,25 @@ functions {
   }
 }
 
-# Selections (enabled functions)
+# Wrapper for simple legacy analyzers.
+functions {
+  type: ANALYZER
+  name: "Simple"
+  needs: GIT_FILE_DETAILS
+  provides: RESULTS
+  owner: "qyearsley@chromium.org"
+  monorail_component: "Infra>Platform>Tricium>Analyzer"
+  impls {
+    runtime_platform: LINUX
+    provides_for_platform: LINUX
+    recipe {
+      project: "chromium"
+      bucket: "try"
+      builder: "tricium-simple"
+    }
+    deadline: 900
+  }
+}
 
 selections {
   function: "ClangTidy"
@@ -70,41 +85,13 @@ selections {
 }
 
 selections {
-  function: "GitFileIsolator"
-  platform: UBUNTU
-}
-
-selections {
-  function: "HttpsCheck"
-  platform: UBUNTU
-}
-
-selections {
   function: "Metrics"
-  platform: UBUNTU
-}
-
-selections {
-  function: "MojomCommentator"
-  platform: UBUNTU
-}
-
-selections {
-  function: "Pylint"
-  platform: UBUNTU
-  configs {
-    name: "disable"
-    value: "all"
-  }
-  configs {
-    name: "enable"
-    value: "syntax-error,unused-variable,undefined-variable,unused-import"
-  }
+  platform: LINUX
 }
 
 selections {
-  function: "SpellChecker"
-  platform: UBUNTU
+  function: "Simple"
+  platform: LINUX
 }
 
 repos {
diff --git a/chromium/infra/config/generators/scheduler-bucketed-jobs.star b/chromium/infra/config/generators/scheduler-bucketed-jobs.star
deleted file mode 100644
index 49e9ea26e4c..00000000000
--- a/chromium/infra/config/generators/scheduler-bucketed-jobs.star
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 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 _ensure_ci_jobs_can_be_bucketed_or_not(ctx):
-    cfg = ctx.output["luci-scheduler.cfg"]
-
-    ci_jobs = {}
-    for j in cfg.job:
-        # The default behavior is the same as 'triggered', so look for non-empty
-        # schedules that are not 'triggered', we don't want to create duplicates of
-        # those jobs because it will cause double the number of builds to be
-        # scheduled
-        if j.schedule and j.schedule != "triggered":
-            continue
-
-        bucket = j.buildbucket.bucket
-        if bucket != "luci.chromium.ci":
-            continue
-
-        builder = j.buildbucket.builder
-        if builder in ci_jobs:
-            fail("Multiple jobs defined for CI builder ci/{}".format(builder))
-
-        ci_jobs[builder] = j
-
-    for builder, job in ci_jobs.items():
-        new_job = proto.from_wirepb(proto.message_type(job), proto.to_wirepb(job))
-        new_job.id = builder if job.id != builder else "ci-{}".format(builder)
-        cfg.job.append(new_job)
-
-    jobs = sorted(cfg.job, key = lambda j: j.id)
-    cfg.job.clear()
-    cfg.job.extend(jobs)
-
-lucicfg.generator(_ensure_ci_jobs_can_be_bucketed_or_not)
diff --git a/chromium/infra/config/generators/scheduler-noop-jobs.star b/chromium/infra/config/generators/scheduler-noop-jobs.star
index a900d1f06d1..ed38d0d67a0 100644
--- a/chromium/infra/config/generators/scheduler-noop-jobs.star
+++ b/chromium/infra/config/generators/scheduler-noop-jobs.star
@@ -16,22 +16,6 @@ without error.
 load("@stdlib//internal/luci/proto.star", "scheduler_pb")
 load("//project.star", "settings")
 
-# For the chromium project (settings.is_master is True), we have bucket-based
-# milestones for <=M85. We create a no-op job that prefixes the ci bucket name
-# for those milestones. Combined with setting the bucketed_triggers property,
-# this makes it safe to issue triggers for the builders that don't exist for the
-# milestone.
-# For the chromium milestone projects (settings.is_master is False), the
-# milestone project will use the same bucket names, so we create a no-op job for
-# the 'ci' bucket.
-_BRANCH_NOOP_CONFIG = struct(
-    buckets = ["ci-m85"],
-    fmt = "{bucket}-{builder}",
-) if settings.is_master else struct(
-    buckets = ["ci"],
-    fmt = "{builder}",
-)
-
 _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
@@ -59,17 +43,19 @@ _NON_BRANCHED_TESTERS = (
 )
 
 _TESTER_NOOP_JOBS = [scheduler_pb.Job(
-    id = _BRANCH_NOOP_CONFIG.fmt.format(bucket = bucket, builder = builder),
+    id = builder,
     schedule = "triggered",
-    acl_sets = [bucket],
+    acl_sets = ["ci"],
     acls = [scheduler_pb.Acl(
         role = scheduler_pb.Acl.TRIGGERER,
         granted_to = "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
     )],
     noop = scheduler_pb.NoopTask(),
-) for builder in _NON_BRANCHED_TESTERS for bucket in _BRANCH_NOOP_CONFIG.buckets]
+) for builder in _NON_BRANCHED_TESTERS]
 
 def _add_noop_jobs(ctx):
+    if settings.is_master:
+        return
     cfg = ctx.output["luci-scheduler.cfg"]
     for j in _TESTER_NOOP_JOBS:
         cfg.job.append(j)
diff --git a/chromium/infra/config/lib/args.star b/chromium/infra/config/lib/args.star
index 980223bdf46..bb8423ae336 100644
--- a/chromium/infra/config/lib/args.star
+++ b/chromium/infra/config/lib/args.star
@@ -35,8 +35,11 @@ def defaults(extends = None, **vars):
       * get_value_from_kwargs(name, kwargs) - Gets the value of a keyword
         argument. If `name` is in `kwargs`, `kwargs[name]` is returned. Otherwise,
         the module-level default for `name` is returned.
+      * set(**kwargs) - Sets module-level defaults. For each keyword, sets the
+        module-level default with the keyword as the name to the value of the
+        keyword.
     """
-    methods = ["get_value", "get_value_from_kwargs"]
+    methods = ["get_value", "get_value_from_kwargs", "set"]
     for m in methods:
         if m in vars:
             fail("{!r} can't be used as the name of a default: it is a method"
@@ -55,9 +58,14 @@ def defaults(extends = None, **vars):
     def get_value_from_kwargs(name, kwargs):
         return get_value(name, kwargs.get(name, DEFAULT))
 
+    def set(**kwargs):
+        for k, v in kwargs.items():
+            vars[k].set(v)
+
     return struct(
         get_value = get_value,
         get_value_from_kwargs = get_value_from_kwargs,
+        set = set,
         **vars
     )
 
diff --git a/chromium/infra/config/lib/branches.star b/chromium/infra/config/lib/branches.star
index e459129f4c5..16730a88aa5 100644
--- a/chromium/infra/config/lib/branches.star
+++ b/chromium/infra/config/lib/branches.star
@@ -9,16 +9,28 @@ a subset of luci functions with an additional `branch_selector` keyword argument
 that controls what branches the definition is actually executed for. If
 `branch_selector` doesn't match the current branch as determined by values on
 the `settings` struct in '//project.star', then the resource is not defined. The
-`branch_selector argument` can be one of the following constants:
-* MAIN_ONLY - The resource is defined only for main/master/trunk
+`branch_selector` argument can be one of the following constants referring to
+the category of the branch:
+* MAIN - The resource is defined only for main/master/trunk
     [`settings.is_master`]
-* STANDARD_RELEASES - The resource is defined for main/master/trunk and beta and
-    stable branches
-    [`settings.is_master and not settings.is_lts_branch`]
-* ALL_RELEASES - The resource is defined for main/master/trunk, beta and stable
-    branches and LTC/LTS branches
-    [`True`]
-The constants are also accessible via the `branches` struct.
+* STANDARD_BRANCHES - The resource is defined only for the beta and stable
+    branches.
+    [`not settings.is_master and not settings.is_lts_branch`]
+* LTS_BRANCHES - The resource is defined only for the long-term support branches
+    (LTC and LTR).
+    [`not settings.is_master and settings.is_lts_branch`]
+
+The `branch_selector` argument can also be one of the following constants
+composing multiple categories:
+* STANDARD_MILESTONES - The resource is defined for a branch as it moves through
+    the standad release channels: trunk -> beta -> stable.
+* LTS_MILESTONES - The resource is defined for a branch as it move through the
+    long-term suport release channels: trunk -> beta -> stable -> LTC -> LTR.
+* ALL_BRANCHES - The resource is defined for all branches and main/master/trunk.
+* NOT_MAIN - The resource is defined for all branches, but not for
+    main/master/trunk.
+
+The `branch_selector` constants are also accessible via the `branches` struct.
 
 For other uses cases where execution needs to vary by branch, the following are
 also accessible via the `branches` struct:
@@ -34,21 +46,32 @@ load("//project.star", "settings")
 def _branch_selector(tag):
     return struct(__branch_selector__ = tag)
 
-MAIN_ONLY = _branch_selector("MAIN_ONLY")
-STANDARD_RELEASES = _branch_selector("STANDARD_RELEASES")
-ALL_RELEASES = _branch_selector("ALL_RELEASES")
+MAIN = _branch_selector("MAIN")
+STANDARD_BRANCHES = _branch_selector("STANDARD_BRANCHES")
+LTS_BRANCHES = _branch_selector("LTS_BRANCHES")
 
-_BRANCH_SELECTORS = (MAIN_ONLY, STANDARD_RELEASES, ALL_RELEASES)
+_BRANCH_SELECTORS = (MAIN, STANDARD_BRANCHES, LTS_BRANCHES)
 
 def _matches(branch_selector):
     """Returns whether `branch_selector` matches the project settings."""
-    if branch_selector == MAIN_ONLY:
-        return settings.is_master
-    if branch_selector == STANDARD_RELEASES:
-        return settings.is_master or not settings.is_lts_branch
-    if branch_selector == ALL_RELEASES:
-        return True
-    fail("branch_selector must be one of {}, got {!r}".format(_BRANCH_SELECTORS, branch_selector))
+    if type(branch_selector) == type(struct()):
+        branch_selectors = [branch_selector]
+    else:
+        branch_selectors = branch_selector
+    for b in branch_selectors:
+        if b == MAIN:
+            if settings.is_master:
+                return True
+        elif b == STANDARD_BRANCHES:
+            if not settings.is_master and not settings.is_lts_branch:
+                return True
+        elif b == LTS_BRANCHES:
+            if settings.is_lts_branch:
+                return True
+        else:
+            fail("elements of branch_selectors must be one of {}, got {!r}"
+                .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.
@@ -59,14 +82,14 @@ def _value(*, for_main = None, for_branches = None):
     """
     return for_main if settings.is_master else for_branches
 
-def _exec(module, *, branch_selector = MAIN_ONLY):
+def _exec(module, *, branch_selector = MAIN):
     """Execute `module` if `branch_selector` matches the project settings."""
     if not _matches(branch_selector):
         return
     exec(module)
 
 def _make_branch_conditional(fn):
-    def conditional_fn(*args, branch_selector = MAIN_ONLY, **kwargs):
+    def conditional_fn(*args, branch_selector = MAIN, **kwargs):
         if not _matches(branch_selector):
             return
         fn(*args, **kwargs)
@@ -74,9 +97,20 @@ def _make_branch_conditional(fn):
     return conditional_fn
 
 branches = struct(
-    MAIN_ONLY = MAIN_ONLY,
-    STANDARD_RELEASES = STANDARD_RELEASES,
-    ALL_RELEASES = ALL_RELEASES,
+    # Basic branch selectors
+    MAIN = MAIN,
+    STANDARD_BRANCHES = STANDARD_BRANCHES,
+    LTS_BRANCHES = LTS_BRANCHES,
+
+    # Branch selectors for tracking milestones through release channels
+    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],
+
+    # Branch functions
     matches = _matches,
     exec = _exec,
     value = _value,
diff --git a/chromium/infra/config/lib/builders.star b/chromium/infra/config/lib/builders.star
index 7271119271a..568c646dcdb 100644
--- a/chromium/infra/config/lib/builders.star
+++ b/chromium/infra/config/lib/builders.star
@@ -64,9 +64,8 @@ os = struct(
     MAC_10_13 = os_enum("Mac-10.13", os_category.MAC),
     MAC_10_14 = os_enum("Mac-10.14", os_category.MAC),
     MAC_10_15 = os_enum("Mac-10.15", os_category.MAC),
-    MAC_11_0 = os_enum("Mac-11.0", os_category.MAC),
-    # TODO(crbug/1121185): Remove 10.13 once builders have been migrated to 10.15.
-    MAC_DEFAULT = os_enum("Mac-10.13|Mac-10.15", os_category.MAC),
+    MAC_11_0 = os_enum("Mac-11.0|Mac-10.16", os_category.MAC),
+    MAC_DEFAULT = os_enum("Mac-10.15", os_category.MAC),
     MAC_ANY = os_enum("Mac", os_category.MAC),
     WINDOWS_7 = os_enum("Windows-7", os_category.WINDOWS),
     WINDOWS_8_1 = os_enum("Windows-8.1", os_category.WINDOWS),
@@ -124,21 +123,25 @@ goma = struct(
     ),
 )
 
-def xcode_enum(cache_name, cache_path):
-    return swarming.cache(name = cache_name, path = cache_path)
+def xcode_enum(version):
+    return struct(
+        version = version,
+        cache_name = "xcode_ios_{}".format(version),
+        cache_path = "xcode_ios_{}.app".format(version),
+    )
 
 # Keep this in-sync with the versions of bots in //ios/build/bots/.
-xcode_cache = struct(
+xcode = struct(
     # in use by webrtc mac builders
-    x11c29 = xcode_enum("xcode_ios_11c29", "xcode_ios_11c29.app"),
+    x11c29 = xcode_enum("11c29"),
     # in use by ci/ios-simulator-cronet and try/ios-simulator-cronet
-    x11e146 = xcode_enum("xcode_ios_11e146", "xcode_ios_11e146.app"),
+    x11e146 = xcode_enum("11e146"),
     # in use by ios-webkit-tot
-    x11e608cwk = xcode_enum("xcode_ios_11e608cwk", "xcode_ios_11e608cwk.app"),
+    x11e608cwk = xcode_enum("11e608cwk"),
     # (current default) xc12 gm seed
-    x12a7209 = xcode_enum("xcode_ios_12a7209", "xcode_ios_12a7209.app"),
-    # Xcode 12.2 beta 1
-    x12b5018i = xcode_enum("xcode_ios_12b5018i", "xcode_ios_12b5018i.app"),
+    x12a7209 = xcode_enum("12a7209"),
+    # latest Xcode 12 beta version.
+    x12b5035g = xcode_enum("12b5035g"),
 )
 
 ################################################################################
@@ -151,13 +154,9 @@ _DEFAULT_BUILDERLESS_OS_CATEGORIES = [os_category.LINUX]
 # setting ssd:0 dimension
 _EXCLUDE_BUILDERLESS_SSD_OS_CATEGORIES = [os_category.MAC]
 
-def _chromium_tests_property(*, bucketed_triggers, project_trigger_overrides):
+def _chromium_tests_property(*, project_trigger_overrides):
     chromium_tests = {}
 
-    bucketed_triggers = defaults.get_value("bucketed_triggers", bucketed_triggers)
-    if bucketed_triggers:
-        chromium_tests["bucketed_triggers"] = True
-
     project_trigger_overrides = defaults.get_value("project_trigger_overrides", project_trigger_overrides)
     if project_trigger_overrides:
         chromium_tests["project_trigger_overrides"] = project_trigger_overrides
@@ -202,6 +201,7 @@ def _code_coverage_property(
         *,
         use_clang_coverage,
         use_java_coverage,
+        use_javascript_coverage,
         coverage_exclude_sources,
         coverage_test_types):
     code_coverage = {}
@@ -217,6 +217,10 @@ def _code_coverage_property(
     if use_java_coverage:
         code_coverage["use_java_coverage"] = True
 
+    use_javascript_coverage = defaults.get_value("use_javascript_coverage", use_javascript_coverage)
+    if use_javascript_coverage:
+        code_coverage["use_javascript_coverage"] = True
+
     coverage_exclude_sources = defaults.get_value(
         "coverage_exclude_sources",
         coverage_exclude_sources,
@@ -254,7 +258,6 @@ defaults = args.defaults(
     auto_builder_dimension = args.COMPUTE,
     builder_group = None,
     builderless = args.COMPUTE,
-    bucketed_triggers = False,
     configure_kitchen = False,
     cores = None,
     cpu = None,
@@ -263,12 +266,15 @@ defaults = args.defaults(
     goma_debug = False,
     goma_enable_ats = args.COMPUTE,
     goma_jobs = None,
+    list_view = args.COMPUTE,
     os = None,
     project_trigger_overrides = None,
     pool = None,
+    xcode = None,
     ssd = args.COMPUTE,
     use_clang_coverage = False,
     use_java_coverage = False,
+    use_javascript_coverage = False,
     coverage_exclude_sources = None,
     coverage_test_types = None,
     resultdb_bigquery_exports = [],
@@ -287,7 +293,7 @@ defaults = args.defaults(
 def builder(
         *,
         name,
-        branch_selector = branches.MAIN_ONLY,
+        branch_selector = branches.MAIN,
         bucket = args.DEFAULT,
         executable = args.DEFAULT,
         triggered_by = args.DEFAULT,
@@ -300,7 +306,9 @@ def builder(
         builder_group = args.DEFAULT,
         pool = args.DEFAULT,
         ssd = args.DEFAULT,
-        bucketed_triggers = args.DEFAULT,
+        xcode = args.DEFAULT,
+        console_view_entry = None,
+        list_view = args.DEFAULT,
         project_trigger_overrides = args.DEFAULT,
         configure_kitchen = args.DEFAULT,
         goma_backend = args.DEFAULT,
@@ -309,6 +317,7 @@ def builder(
         goma_jobs = args.DEFAULT,
         use_clang_coverage = args.DEFAULT,
         use_java_coverage = args.DEFAULT,
+        use_javascript_coverage = args.DEFAULT,
         coverage_exclude_sources = args.DEFAULT,
         coverage_test_types = args.DEFAULT,
         resultdb_bigquery_exports = args.DEFAULT,
@@ -368,10 +377,19 @@ 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.
-      * bucketed_triggers - a boolean indicating whether jobs triggered by the
-        builder being defined should have the bucket prepended to the builder name
-        to trigger. If True, the 'bucketed_triggers' field will be set in the
-        '$build/chromium_tests' property. By default, considered False.
+      * xcode - a member of the `xcode` enum indicating the xcode version the
+        builder requires. Emits a cache declaration of the form
+        ```{
+          name: <xcode.cache_name>
+          path: <xcode.cache_path>
+        }```. Also emits a 'xcode_build_version:<xcode.version>' property if the
+        property is not already set.
+      * console_view_entry - A `consoles.console_view_entry` struct or a list of
+        them describing console view entries to create for the builder.
+        See `consoles.console_view_entry` for details.
+      * list_view - A string or a list of strings identifying the ID(s) of the
+        list view(s) to add an entry to. Supports a module-level default that
+        defaults to no list views.
       * project_trigger_overrides - a dict mapping the LUCI projects declared in
         recipe BotSpecs to the LUCI project to use when triggering builders. When
         this builder triggers another builder, if the BotSpec for that builder has
@@ -399,6 +417,9 @@ def builder(
       * use_java_coverage - a boolean indicating whether java coverage should be
         used. If True, the 'use_java_coverage" field will be set in the
         '$build/code_coverage' property. By default, considered False.
+      * use_javascript_coverage - a boolean indicating whether javascript coverage
+        should be enabled. If True the 'use_javascript_coverage' field will be set
+        in the '$build/code_coverage' property. By default, considered False.
       * coverage_exclude_sources - a string as the key to find the source file
         exclusion pattern in code_coverage recipe module. Will be copied to
         '$build/code_coverage' property if set. By default, considered None.
@@ -431,8 +452,8 @@ def builder(
              "use goma_backend, goma_dbug, goma_enable_ats and goma_jobs instead")
     if "$build/code_coverage" in properties:
         fail('Setting "$build/code_coverage" property is not supported: ' +
-             "use use_clang_coverage, use_java_coverage, coverage_exclude_sources" +
-             " and/or coverage_test_types instead")
+             "use use_clang_coverage, use_java_coverage, use_javascript_coverage " +
+             " coverage_exclude_sources and/or coverage_test_types instead")
     if "$recipe_engine/isolated" in properties:
         fail('Setting "$recipe_engine/isolated" property is not supported: ' +
              "use isolated_server instead")
@@ -500,7 +521,6 @@ def builder(
         }
 
     chromium_tests = _chromium_tests_property(
-        bucketed_triggers = bucketed_triggers,
         project_trigger_overrides = project_trigger_overrides,
     )
     if chromium_tests != None:
@@ -519,6 +539,7 @@ def builder(
     code_coverage = _code_coverage_property(
         use_clang_coverage = use_clang_coverage,
         use_java_coverage = use_java_coverage,
+        use_javascript_coverage = use_javascript_coverage,
         coverage_exclude_sources = coverage_exclude_sources,
         coverage_test_types = coverage_test_types,
     )
@@ -540,8 +561,15 @@ def builder(
     triggered_by = defaults.get_value("triggered_by", triggered_by)
     if triggered_by != args.COMPUTE:
         kwargs["triggered_by"] = triggered_by
-
-    return branches.builder(
+    xcode = defaults.get_value("xcode", xcode)
+    if xcode:
+        kwargs["caches"] = (kwargs.get("caches") or []) + [swarming.cache(
+            name = xcode.cache_name,
+            path = xcode.cache_path,
+        )]
+        properties.setdefault("xcode_build_version", xcode.version)
+
+    builder = branches.builder(
         name = name,
         branch_selector = branch_selector,
         dimensions = dimensions,
@@ -556,6 +584,57 @@ def builder(
         **kwargs
     )
 
+    builder_name = "{}/{}".format(bucket, name)
+
+    if console_view_entry:
+        if type(console_view_entry) == type(struct()):
+            entries = [console_view_entry]
+        else:
+            entries = console_view_entry
+        entries_without_console_view = [
+            e
+            for e in entries
+            if e.console_view == None
+        ]
+        if len(entries_without_console_view) > 1:
+            fail("Multiple entries provided without console_view: {}"
+                .format(entries_without_console_view))
+
+        for entry in entries:
+            if not branches.matches(entry.branch_selector):
+                continue
+
+            console_view = entry.console_view
+            if console_view == None:
+                console_view = builder_group
+                if not console_view:
+                    fail("Builder does not have builder group and " +
+                         "console_view_entry does not have console view: {}".format(entry))
+
+            luci.console_view_entry(
+                builder = builder_name,
+                console_view = console_view,
+                category = entry.category,
+                short_name = entry.short_name,
+            )
+
+    list_view = defaults.get_value("list_view", list_view)
+
+    # The default for list_view is set to args.COMPUTE instead of None so that
+    # the try builder function can override the default behavior
+    if list_view == args.COMPUTE:
+        list_view = None
+    if list_view:
+        if type(list_view) == type(""):
+            list_view = [list_view]
+        for view in list_view:
+            luci.list_view_entry(
+                builder = builder_name,
+                list_view = view,
+            )
+
+    return builder
+
 def builder_name(builder, bucket = args.DEFAULT):
     bucket = defaults.get_value("bucket", bucket)
     if bucket == args.COMPUTE:
@@ -569,5 +648,5 @@ builders = struct(
     defaults = defaults,
     goma = goma,
     os = os,
-    xcode_cache = xcode_cache,
+    xcode = xcode,
 )
diff --git a/chromium/infra/config/lib/ci.star b/chromium/infra/config/lib/ci.star
index b4a1f0e3846..1a012dfdb36 100644
--- a/chromium/infra/config/lib/ci.star
+++ b/chromium/infra/config/lib/ci.star
@@ -13,419 +13,28 @@ corresponding attribute on `defaults` that is a `lucicfg.var` that can be used
 to set the default value. Can also be accessed through `ci.defaults`.
 """
 
-load("@stdlib//internal/graph.star", "graph")
-load("@stdlib//internal/luci/common.star", "keys")
-load("//project.star", "settings")
 load("./args.star", "args")
 load("./branches.star", "branches")
 load("./builders.star", "builders")
 
 defaults = args.defaults(
     extends = builders.defaults,
-    add_to_console_view = False,
-    console_view = args.COMPUTE,
-    header = None,
     main_console_view = None,
     cq_mirrors_console_view = None,
-    repo = None,
-    refs = None,
 )
 
-def declare_bucket(milestone_vars, *, branch_selector = branches.MAIN_ONLY):
-    if not branches.matches(branch_selector):
-        return
-
-    luci.bucket(
-        name = milestone_vars.ci_bucket,
-        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",
-            ),
-        ],
-    )
-
-    luci.gitiles_poller(
-        name = milestone_vars.ci_poller,
-        bucket = milestone_vars.ci_bucket,
-        repo = "https://chromium.googlesource.com/chromium/src",
-        refs = [milestone_vars.ref],
-    )
-
-    # TODO(gbeaty) Determine what should be in each main console and define it
-    # separately
-    for name, title in (
-        (milestone_vars.main_console_name, milestone_vars.main_console_title),
-        (milestone_vars.cq_mirrors_console_name, milestone_vars.cq_mirrors_console_title),
-    ):
-        ci.overview_console_view(
-            name = name,
-            branch_selector = branch_selector,
-            header = "//chromium-header.textpb",
-            repo = "https://chromium.googlesource.com/chromium/src",
-            refs = [milestone_vars.ref],
-            title = title,
-            top_level_ordering = [
-                "chromium",
-                "chromium.win",
-                "chromium.mac",
-                "chromium.linux",
-                "chromium.chromiumos",
-                "chromium.android",
-                "chrome",
-                "chromium.memory",
-                "chromium.dawn",
-                "chromium.gpu",
-                "chromium.fyi",
-                "chromium.android.fyi",
-                "chromium.clang",
-                "chromium.fuzz",
-                "chromium.gpu.fyi",
-                "chromium.swangle",
-            ],
-        )
-
-def set_defaults(milestone_vars, **kwargs):
-    default_values = dict(
-        add_to_console_view = milestone_vars.is_master,
-        bucket = milestone_vars.ci_bucket,
-        build_numbers = True,
-        configure_kitchen = True,
-        cores = 8,
-        cpu = builders.cpu.X86_64,
-        executable = "recipe:chromium",
-        execution_timeout = 3 * time.hour,
-        header = "//chromium-header.textpb",
-        os = builders.os.LINUX_DEFAULT,
-        pool = "luci.chromium.ci",
-        project_trigger_overrides = {"chromium": settings.project} if not settings.is_master else None,
-        repo = "https://chromium.googlesource.com/chromium/src",
-        refs = [milestone_vars.ref],
-        service_account = "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
-        swarming_tags = ["vpython:native-python-wrapper"],
-        triggered_by = [milestone_vars.ci_poller],
-        # TODO(crbug.com/1129723): set default goma_backend here.
-    )
-    default_values.update(kwargs)
-    for k, v in default_values.items():
-        getattr(defaults, k).set(v)
-
-def _console_view_ordering_graph_key(console_name):
-    return graph.key("@chromium", "", "console_view_ordering", console_name)
-
-def _overview_console_view_ordering_graph_key(console_name):
-    return graph.key("@chromium", "", "overview_console_view_ordering", console_name)
-
-def _console_view_ordering_impl(ctx, *, console_name, ordering):
-    key = _console_view_ordering_graph_key(console_name)
-    graph.add_node(key, props = {
-        "ordering": ordering,
-    })
-    graph.add_edge(keys.project(), key)
-    return graph.keyset(key)
-
-_console_view_ordering = lucicfg.rule(impl = _console_view_ordering_impl)
-
-def _overview_console_view_ordering_impl(ctx, *, console_name, top_level_ordering):
-    key = _overview_console_view_ordering_graph_key(console_name)
-    graph.add_node(key, props = {
-        "top_level_ordering": top_level_ordering,
-    })
-    graph.add_edge(keys.project(), key)
-    return graph.keyset(key)
-
-_overview_console_view_ordering = lucicfg.rule(impl = _overview_console_view_ordering_impl)
-
-def _category_join(parent, category):
-    return "|".join([c for c in (parent, category) if c])
-
-def _level_sort_key(category, ordering):
-    """Compute the key for a single level of ordering.
-
-    A key that can be used to sort categories/short names at the same
-    category nesting level.
-    """
-    for i, c in enumerate(ordering):
-        if c == category:
-            # We found the category in the ordering, so the index in the ordering is
-            # sufficient for sorting
-            return (i,)
-
-    # We didn't find the category, the key uses:
-    # 1. The length of the ordering so that it sorts after all the categories in
-    #    the ordering
-    # 2. The category itself, which lexicographically sorts all of the categories
-    #    that do not match the ordering
-    return (len(ordering), category)
-
-def _builder_sort_key(console_ordering, category, short_name, name):
-    """Compute the key for a builder.
-
-    Builders are sorted lexicographically by the sequence of category
-    components, then lexicographically by the short name, then by the
-    builder names. The ordering for the console_view modifies the sorting
-    for category components and short names for given prefixes of the
-    category component sequence. Builders with no short name will sort
-    before builders with a short name for a given category, which cannot
-    be modified by the ordering.
-
-    Returns:
-      A key that can be used to sort builder entries within the same console.
-    """
-    current_category = None
-
-    # Build the category key as a sequence of the keys for each level
-    category_key = []
-    if category:
-        for c in category.split("|"):
-            ordering = console_ordering.get(current_category, [])
-            if type(ordering) == type(""):
-                ordering = console_ordering[ordering]
-            if type(ordering) == type(struct()):
-                ordering = ordering.categories
-            category_key.append(_level_sort_key(c, ordering))
-            current_category = _category_join(current_category, c)
-
-    short_name_key = ()
-    if short_name:
-        ordering = console_ordering.get(category, [])
-        if type(ordering) == type(""):
-            ordering = console_ordering[ordering]
-        short_name_ordering = getattr(ordering, "short_names", [])
-        short_name_key = _level_sort_key(short_name, short_name_ordering)
-
-    return (
-        category_key,
-        short_name_key,
-        name,
-    )
-
-def _get_console_ordering(console_name):
-    """Get the ordering dict used for sorting entries of a console_view.
-
-    Returns:
-      The ordering dict used to sort entries of the console_view with the
-      given name or None if the name does not refer to a console_view with
-      an ordering.
-    """
-    graph_key = _console_view_ordering_graph_key(console_name)
-    node = graph.node(graph_key)
-    return node.props.ordering if node != None else None
-
-def _get_console_view_key_fn(console_name):
-    """Get the key function for sorting entries of a console_view.
-
-    Returns:
-      The key function used to sort entries of the console_view with the
-      given name or None if the name does not refer to a console_view with
-      an ordering.
-    """
-    ordering = _get_console_ordering(console_name)
-    if ordering == None:
-        return None
-
-    def key_fn(b):
-        return _builder_sort_key(ordering, b.category, b.short_name, b.name)
-
-    return key_fn
-
-def _get_overview_console_view_key_fn(console_name):
-    """Get the key function for sorting overview_console_view entries.
-
-    Returns:
-      The key function used to sort entries of the overview_console_view
-      with the given name or None if the name does not refer to an
-      overview_console_view.
-    """
-    overview_console_ordering = graph.node(
-        _overview_console_view_ordering_graph_key(console_name),
-    )
-    if overview_console_ordering == None:
-        return None
-
-    top_level_ordering = overview_console_ordering.props.top_level_ordering
-
-    def key_fn(b):
-        if not b.category:
-            fail("Builder {} must have a category".format(b))
-        category_components = b.category.split("|", 1)
-
-        subconsole = category_components[0]
-        subconsole_sort_key = _level_sort_key(subconsole, top_level_ordering)
-
-        builder_sort_key = ()
-        subconsole_ordering = _get_console_ordering(subconsole)
-        if subconsole_ordering != None:
-            category = ""
-            if len(category_components) > 1:
-                category = category_components[1]
-            builder_sort_key = _builder_sort_key(
-                subconsole_ordering,
-                category,
-                b.short_name,
-                b.name,
-            )
-
-        return (
-            subconsole_sort_key,
-            builder_sort_key,
-        )
-
-    return key_fn
-
-def _sort_console_entries(ctx):
-    milo = ctx.output["luci-milo.cfg"]
-    consoles = []
-    for console in milo.consoles:
-        if not console.builders:
-            continue
-        key_fn = (_get_console_view_key_fn(console.id) or
-                  _get_overview_console_view_key_fn(console.id))
-        if key_fn:
-            console.builders = sorted(console.builders, key_fn)
-        consoles.append(console)
-
-lucicfg.generator(_sort_console_entries)
-
-def ordering(*, short_names = None, categories = None):
-    """Specifies the sorting behavior for a category.
-
-    Args:
-      short_names - A list of strings that specifies the order short names
-        should appear for builders in the same category. Builders without
-        short names will appear before all others and builders with short
-        names that do not appear in the list will be sorted
-        lexicographically after short names that do appear in the list. By
-        default, short names are sorted lexicographically.
-      categories - A list of strings that specifies the order the next
-        category component should appear for builders with matching
-        category prefix. Builders without any additional category
-        components will appear before all others and builders whose next
-        category component do not appear in the list will be sorted
-        lexicographically by the next category component. By default, the
-        next category components are sorted lexicographically.
-    """
-    return struct(
-        short_names = short_names or [],
-        categories = categories or [],
-    )
-
-def console_view(*, name, branch_selector = branches.MAIN_ONLY, ordering = None, **kwargs):
-    """Create a console view, optionally providing an entry ordering.
-
-    Args:
-      name - The name of the console view.
-      ordering - A dictionary defining the ordering of categories for the
-        console. If not provided, the console will not be sorted.
-
-        The keys of the dictionary indicate the category that the values
-        applies the sorting to and can take one of two forms:
-        1.  None: Controls the ordering of the top-level categories and/or
-            the short names of builders that have no category.
-        2.  str: Category string to apply the ordering to the next nested
-            level of categories and/or the short names of builders with
-            that category. Arbitrary strings can be used also, which can
-            be used as aliases for other entries to refer to.
-
-        The value for each entry defines the ordering to be applied to
-        builders that have matched the sequence of category components
-        identified by the key and can take one of two forms:
-        1.  struct created using `ci.ordering`: See `ci.ordering` for
-            details.
-        2.  list of category components: Equivalent to a `ci.ordering`
-            call that only specifies `categories` with the given list.
-        3.  str: An alias for another category. The string must be another
-            key in the dict. The ordering will be looked up by that key
-            instead.
-      kwargs - Additional keyword arguments to forward on to
-        `luci.console_view`. The header and repo arguments support
-         module-level defaults.
-    """
-    if not branches.matches(branch_selector):
-        return
-
-    kwargs["header"] = defaults.get_value_from_kwargs("header", kwargs)
-    kwargs["repo"] = defaults.get_value_from_kwargs("repo", kwargs)
-    kwargs["refs"] = defaults.get_value_from_kwargs("refs", kwargs)
-    luci.console_view(
-        name = name,
-        **kwargs
-    )
-
-    _console_view_ordering(
-        console_name = name,
-        ordering = ordering or {},
-    )
-
-def overview_console_view(*, name, top_level_ordering, branch_selector = branches.MAIN_ONLY, **kwargs):
-    """Create an overview console view.
-
-    An overview console view is a console view that contains a subset of
-    entries from other consoles. The entries from each console will have
-    that console's name prepended to the entries' categories and will
-    appear in the same order as they do in that console. The ordering of
-    entries from different consoles is controlled by the
-    `top_level_ordering` parameter.
-
-    Args:
-      name - The name of the console view.
-      top_level_ordering - A list of strings defining the order that
-        entries from different consoles will appear. Entries will be
-        sorted by the name of the console they come from, appearing in the
-        same order as in top_level_ordering. Entries from consoles whose
-        name does not appear in the list will be sorted lexicographically
-        by the console name and appear after entries whose console does
-        appear in the list.
-      kwargs - Additional keyword arguments to forward on to
-        `luci.console_view`. The header and repo arguments support
-         module-level defaults.
-    """
-    kwargs["header"] = defaults.get_value_from_kwargs("header", kwargs)
-    kwargs["repo"] = defaults.get_value_from_kwargs("repo", kwargs)
-    luci.console_view(
-        name = name,
-        **kwargs
-    )
-
-    _overview_console_view_ordering(
-        console_name = name,
-        top_level_ordering = top_level_ordering,
-    )
-
-def console_view_entry(*, category = None, short_name = None):
-    """Specifies the details of a console view entry.
-
-    See https://chromium.googlesource.com/infra/luci/luci-go/+/refs/heads/master/lucicfg/doc/README.md#luci.console_view_entry
-    for details on the arguments.
-
-    Returns:
-      A struct that can be passed to the `console_view_entry` argument of
-      `ci.builder` to add an entry to the console for the builder's group.
-    """
-    return struct(
-        category = category,
-        short_name = short_name,
-    )
-
 def ci_builder(
         *,
         name,
-        branch_selector = branches.MAIN_ONLY,
-        add_to_console_view = args.DEFAULT,
+        branch_selector = branches.MAIN,
         console_view = args.DEFAULT,
         main_console_view = args.DEFAULT,
         cq_mirrors_console_view = args.DEFAULT,
         console_view_entry = None,
         tree_closing = False,
         notifies = None,
+        resultdb_bigquery_exports = None,
+        experiments = None,
         **kwargs):
     """Define a CI builder.
 
@@ -434,31 +43,31 @@ def ci_builder(
       branch_selector - A branch selector value controlling whether the
         builder definition is executed. See branches.star for more
         information.
-      add_to_console_view - A bool indicating whether an entry should be
-        created for the builder in the console identified by
-        `console_view`. Supports a module-level default that defaults to
-        False.
-      console_view - A string identifying the ID of the console view to
-        add an entry to. Supports a module-level default that defaults to
-        the group of the builder, if provided. An entry will be added
-        only if `add_to_console_view` is True and `console_view_entry` is
-        provided.
+      console_view_entry - A `consoles.console_view_entry` struct or a list of
+        them describing console view entries to create for the builder.
+        See `consoles.console_view_entry` for details.
       main_console_view - A string identifying the ID of the main console
         view to add an entry to. Supports a module-level default that
         defaults to None. An entry will be added only if
-        `console_view_entry` is provided. Note that `add_to_console_view`
-        has no effect on creating an entry to the main console view.
+        `console_view_entry` is provided.
       cq_mirrors_console_view - A string identifying the ID of the CQ
         mirrors console view to add an entry to. Supports a module-level
         default that defaults to None. An entry will be added only if
-        `console_view_entry` is provided. Note that `add_to_console_view`
-        has no effect on creating an entry to the main console view.
+        `console_view_entry` is provided.
       console_view_entry - A structure providing the details of the entry
         to add to the console view. See `ci.console_view_entry` for details.
       tree_closing - If true, failed builds from this builder that meet certain
         criteria will close the tree and email the sheriff. See the
         'chromium-tree-closer' config in notifiers.star for the full criteria.
       notifies - Any extra notifiers to attach to this builder.
+      resultdb_bigquery_exports - a list of resultdb.export_test_results(...)
+        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
+      experiments - a dict of experiment name to the percentage chance (0-100)
+        that it will apply to builds generated from this builder.
     """
     if not branches.matches(branch_selector):
         return
@@ -469,39 +78,53 @@ def ci_builder(
     if tree_closing and bucket == "ci":
         notifies = (notifies or []) + ["chromium-tree-closer", "chromium-tree-closer-email"]
 
+    merged_resultdb_bigquery_exports = [
+        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",
+            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/.+",
+            ),
+        ),
+    ]
+    merged_resultdb_bigquery_exports.extend(resultdb_bigquery_exports or [])
+
+    # Enable "chromium.resultdb.result_sink" on ci builders at 50%.
+    experiments = experiments or {}
+    experiments.setdefault("chromium.resultdb.result_sink", 50)
+
     # Define the builder first so that any validation of luci.builder arguments
     # (e.g. bucket) occurs before we try to use it
     builders.builder(
         name = name,
         branch_selector = branch_selector,
-        resultdb_bigquery_exports = [resultdb.export_test_results(
-            bq_table = "luci-resultdb.chromium.ci_test_results",
-        )],
+        console_view_entry = console_view_entry,
+        resultdb_bigquery_exports = merged_resultdb_bigquery_exports,
         notifies = notifies,
+        experiments = experiments,
         **kwargs
     )
 
     if console_view_entry:
-        console_view = defaults.get_value("console_view", console_view)
-        if console_view == args.COMPUTE:
-            console_view = defaults.get_value_from_kwargs("builder_group", kwargs)
+        # builder didn't fail, we're guaranteed that console_view_entry is
+        # either a single console_view_entry or a list of them and that they are valid
+        if type(console_view_entry) == type(struct()):
+            entry = console_view_entry
+        else:
+            entry = console_view_entry[0]
+
+        if branches.matches(entry.branch_selector):
+            console_view = entry.console_view
+            if console_view == None:
+                console_view = defaults.get_value_from_kwargs("builder_group", kwargs)
 
         if console_view:
-            add_to_console_view = defaults.get_value(
-                "add_to_console_view",
-                add_to_console_view,
-            )
-
             builder = "{}/{}".format(bucket, name)
 
-            if add_to_console_view:
-                luci.console_view_entry(
-                    builder = builder,
-                    console_view = console_view,
-                    category = console_view_entry.category,
-                    short_name = console_view_entry.short_name,
-                )
-
             overview_console_category = console_view
             if console_view_entry.category:
                 overview_console_category = "|".join([console_view, console_view_entry.category])
@@ -590,10 +213,13 @@ def clang_mac_builder(*, name, cores = 24, **kwargs):
     return clang_builder(
         name = name,
         cores = cores,
-        os = builders.os.MAC_10_14,
+        os = builders.os.MAC_10_15,
         ssd = True,
         properties = {
-            "xcode_build_version": "11a1027",
+            # The Chromium build doesn't need system Xcode, but the ToT clang
+            # bots also build clang and llvm and that build does need system
+            # Xcode.
+            "xcode_build_version": "12a7209",
         },
         **kwargs
     )
@@ -682,6 +308,11 @@ def fyi_builder(
         builder_group = "chromium.fyi",
         execution_timeout = execution_timeout,
         goma_backend = goma_backend,
+        # TODO(crbug.com/1108016): Move this kwarg to ci.builder(), after
+        # ResultSink and result_adapter is confirmed to work.
+        experiments = {
+            "chromium.resultdb.result_sink": 100,
+        },
         **kwargs
     )
 
@@ -719,25 +350,17 @@ def fyi_coverage_builder(
 def fyi_ios_builder(
         *,
         name,
-        caches = None,
         executable = "recipe:chromium",
         goma_backend = builders.goma.backend.RBE_PROD,
         os = builders.os.MAC_10_15,
-        properties = None,
+        xcode = builders.xcode.x12a7209,
         **kwargs):
-    # Default cache and properties sync
-    caches = caches or [builders.xcode_cache.x12a7209]
-
-    properties = properties or {}
-    properties.setdefault("xcode_build_version", "12a7209")
-
     return fyi_builder(
         name = name,
-        caches = caches,
         cores = None,
         executable = executable,
         os = os,
-        properties = properties,
+        xcode = xcode,
         **kwargs
     )
 
@@ -928,23 +551,16 @@ def mac_builder(
 def mac_ios_builder(
         *,
         name,
-        caches = None,
         executable = "recipe:chromium",
         goma_backend = builders.goma.backend.RBE_PROD,
-        properties = None,
+        xcode = builders.xcode.x12a7209,
         **kwargs):
-    caches = caches or [builders.xcode_cache.x12a7209]
-
-    properties = properties or {}
-    properties.setdefault("xcode_build_version", "12a7209")
-
     return mac_builder(
         name = name,
-        caches = caches,
         goma_backend = goma_backend,
         executable = executable,
         os = builders.os.MAC_10_15,
-        properties = properties,
+        xcode = xcode,
         **kwargs
     )
 
@@ -1024,7 +640,7 @@ def swangle_windows_builder(*, name, **kwargs):
     return swangle_builder(
         name = name,
         goma_backend = builders.goma.backend.RBE_PROD,
-        os = builders.os.WINDOWS_DEFAULT,
+        os = builders.os.WINDOWS_ANY,
         pool = "luci.chromium.gpu.ci",
         **kwargs
     )
@@ -1045,6 +661,17 @@ def thin_tester(
         **kwargs
     )
 
+def updater_builder(
+        *,
+        name,
+        **kwargs):
+    return ci.builder(
+        name = name,
+        builder_group = "chromium.updater",
+        goma_backend = builders.goma.backend.RBE_PROD,
+        **kwargs
+    )
+
 def win_builder(
         *,
         name,
@@ -1061,14 +688,13 @@ def win_builder(
     )
 
 ci = struct(
-    builder = ci_builder,
-    console_view = console_view,
-    console_view_entry = console_view_entry,
-    declare_bucket = declare_bucket,
+    # Module-level defaults for ci functions
     defaults = defaults,
-    overview_console_view = overview_console_view,
-    ordering = ordering,
-    set_defaults = set_defaults,
+
+    # Functions for declaring CI builders
+    builder = ci_builder,
+
+    # More specific builder wrapper functions
     android_builder = android_builder,
     android_fyi_builder = android_fyi_builder,
     chromium_builder = chromium_builder,
@@ -1104,5 +730,6 @@ ci = struct(
     swangle_mac_builder = swangle_mac_builder,
     swangle_windows_builder = swangle_windows_builder,
     thin_tester = thin_tester,
+    updater_builder = updater_builder,
     win_builder = win_builder,
 )
diff --git a/chromium/infra/config/lib/consoles.star b/chromium/infra/config/lib/consoles.star
new file mode 100644
index 00000000000..2c870043f91
--- /dev/null
+++ b/chromium/infra/config/lib/consoles.star
@@ -0,0 +1,421 @@
+# Copyright 2020 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.
+
+"""Library for defining consoles in a distributed fashion.
+
+The `console_view`, `console_view_entry`, `ordering` and
+`overview_console_view` functions defined in this module enable defining
+console views in a distributed manner with the order of the entries
+being customizable and ignoring declaration order of the builders. They
+can also be accessed through `consoles.console_view`,
+`consoles.console_view_entry`, `consoles.ordering` and
+`consoles.overview_console_view`, respectively.
+
+The `list_view` function defined in this module enables defining a list
+view in a distributed manner with the order of the entries being
+deterministic and ignoring declaration order of the builders. It can
+also be accessed through `consoles.list_view`.
+
+The `defaults` struct provides module-level defaults for the arguments
+to `console_view` and `overview_console_view`. Calling `defaults.set`
+with keyword argument corresponding to the parameters that support
+module-level defaults will set the values use when no explicit values
+are provided in a declaration. Can also be accessed through
+`consoles.defaults`.
+"""
+
+load("@stdlib//internal/graph.star", "graph")
+load("@stdlib//internal/luci/common.star", "keys")
+load("./args.star", "args")
+load("./branches.star", "branches")
+
+defaults = args.defaults(
+    header = None,
+    repo = None,
+    refs = None,
+)
+
+def _console_view_ordering_graph_key(console_name):
+    return graph.key("@chromium", "", "console_view_ordering", console_name)
+
+def _overview_console_view_ordering_graph_key(console_name):
+    return graph.key("@chromium", "", "overview_console_view_ordering", console_name)
+
+def _console_view_ordering_impl(ctx, *, console_name, ordering):
+    key = _console_view_ordering_graph_key(console_name)
+    graph.add_node(key, props = {
+        "ordering": ordering,
+    })
+    graph.add_edge(keys.project(), key)
+    return graph.keyset(key)
+
+_console_view_ordering = lucicfg.rule(impl = _console_view_ordering_impl)
+
+def _overview_console_view_ordering_impl(ctx, *, console_name, top_level_ordering):
+    key = _overview_console_view_ordering_graph_key(console_name)
+    graph.add_node(key, props = {
+        "top_level_ordering": top_level_ordering,
+    })
+    graph.add_edge(keys.project(), key)
+    return graph.keyset(key)
+
+_overview_console_view_ordering = lucicfg.rule(impl = _overview_console_view_ordering_impl)
+
+def _category_join(parent, category):
+    return "|".join([c for c in (parent, category) if c])
+
+def _level_sort_key(category, ordering):
+    """Compute the key for a single level of ordering.
+
+    A key that can be used to sort categories/short names at the same
+    category nesting level.
+    """
+    for i, c in enumerate(ordering):
+        if c == category:
+            # We found the category in the ordering, so the index in the ordering is
+            # sufficient for sorting
+            return (i,)
+
+    # We didn't find the category, the key uses:
+    # 1. The length of the ordering so that it sorts after all the categories in
+    #    the ordering
+    # 2. The category itself, which lexicographically sorts all of the categories
+    #    that do not match the ordering
+    return (len(ordering), category)
+
+def _builder_sort_key(console_ordering, category, short_name, name):
+    """Compute the key for a builder.
+
+    Builders are sorted lexicographically by the sequence of category
+    components, then lexicographically by the short name, then by the
+    builder names. The ordering for the console_view modifies the sorting
+    for category components and short names for given prefixes of the
+    category component sequence. Builders with no short name will sort
+    before builders with a short name for a given category, which cannot
+    be modified by the ordering.
+
+    Returns:
+      A key that can be used to sort builder entries within the same console.
+    """
+    current_category = None
+
+    # Build the category key as a sequence of the keys for each level
+    category_key = []
+    if category:
+        for c in category.split("|"):
+            ordering = console_ordering.get(current_category, [])
+            if type(ordering) == type(""):
+                ordering = console_ordering[ordering]
+            if type(ordering) == type(struct()):
+                ordering = ordering.categories
+            category_key.append(_level_sort_key(c, ordering))
+            current_category = _category_join(current_category, c)
+
+    short_name_key = ()
+    if short_name:
+        ordering = console_ordering.get(category, [])
+        if type(ordering) == type(""):
+            ordering = console_ordering[ordering]
+        short_name_ordering = getattr(ordering, "short_names", [])
+        short_name_key = _level_sort_key(short_name, short_name_ordering)
+
+    return (
+        category_key,
+        short_name_key,
+        name,
+    )
+
+def _get_console_ordering(console_name):
+    """Get the ordering dict used for sorting entries of a console_view.
+
+    Returns:
+      The ordering dict used to sort entries of the console_view with the
+      given name or None if the name does not refer to a console_view with
+      an ordering.
+    """
+    graph_key = _console_view_ordering_graph_key(console_name)
+    node = graph.node(graph_key)
+    return node.props.ordering if node != None else None
+
+def _get_console_view_key_fn(console_name):
+    """Get the key function for sorting entries of a console_view.
+
+    Returns:
+      The key function used to sort entries of the console_view with the
+      given name or None if the name does not refer to a console_view with
+      an ordering.
+    """
+    ordering = _get_console_ordering(console_name)
+    if ordering == None:
+        return None
+
+    def key_fn(b):
+        return _builder_sort_key(ordering, b.category, b.short_name, b.name)
+
+    return key_fn
+
+def _get_overview_console_view_key_fn(console_name):
+    """Get the key function for sorting overview_console_view entries.
+
+    Returns:
+      The key function used to sort entries of the overview_console_view
+      with the given name or None if the name does not refer to an
+      overview_console_view.
+    """
+    overview_console_ordering = graph.node(
+        _overview_console_view_ordering_graph_key(console_name),
+    )
+    if overview_console_ordering == None:
+        return None
+
+    top_level_ordering = overview_console_ordering.props.top_level_ordering
+
+    def key_fn(b):
+        if not b.category:
+            fail("Builder {} must have a category".format(b))
+        category_components = b.category.split("|", 1)
+
+        subconsole = category_components[0]
+        subconsole_sort_key = _level_sort_key(subconsole, top_level_ordering)
+
+        builder_sort_key = ()
+        subconsole_ordering = _get_console_ordering(subconsole)
+        if subconsole_ordering != None:
+            category = ""
+            if len(category_components) > 1:
+                category = category_components[1]
+            builder_sort_key = _builder_sort_key(
+                subconsole_ordering,
+                category,
+                b.short_name,
+                b.name,
+            )
+
+        return (
+            subconsole_sort_key,
+            builder_sort_key,
+        )
+
+    return key_fn
+
+def ordering(*, short_names = None, categories = None):
+    """Specifies the sorting behavior for a category.
+
+    Args:
+      short_names - A list of strings that specifies the order short names
+        should appear for builders in the same category. Builders without
+        short names will appear before all others and builders with short
+        names that do not appear in the list will be sorted
+        lexicographically after short names that do appear in the list. By
+        default, short names are sorted lexicographically.
+      categories - A list of strings that specifies the order the next
+        category component should appear for builders with matching
+        category prefix. Builders without any additional category
+        components will appear before all others and builders whose next
+        category component do not appear in the list will be sorted
+        lexicographically by the next category component. By default, the
+        next category components are sorted lexicographically.
+    """
+    return struct(
+        short_names = short_names or [],
+        categories = categories or [],
+    )
+
+def console_view(*, name, branch_selector = branches.MAIN, ordering = None, **kwargs):
+    """Create a console view, optionally providing an entry ordering.
+
+    Args:
+      name - The name of the console view.
+      branch_selector - A branch selector value controlling whether the
+        console view definition is executed. See branches.star for
+        more information.
+      ordering - A dictionary defining the ordering of categories for the
+        console. If not provided, the console will not be sorted.
+
+        The keys of the dictionary indicate the category that the values
+        applies the sorting to and can take one of two forms:
+        1.  None: Controls the ordering of the top-level categories and/or
+            the short names of builders that have no category.
+        2.  str: Category string to apply the ordering to the next nested
+            level of categories and/or the short names of builders with
+            that category. Arbitrary strings can be used also, which can
+            be used as aliases for other entries to refer to.
+
+        The value for each entry defines the ordering to be applied to
+        builders that have matched the sequence of category components
+        identified by the key and can take one of two forms:
+        1.  struct created using `consoles.ordering`: See
+            `consoles.ordering` for details.
+        2.  list of category components: Equivalent to a
+            `consoles.ordering` call that only specifies `categories`
+            with the given list.
+        3.  str: An alias for another category. The string must be another
+            key in the dict. The ordering will be looked up by that key
+            instead.
+      kwargs - Additional keyword arguments to forward on to
+        `luci.console_view`. The header, repo and refs arguments support
+        module-level defaults.
+    """
+    if not branches.matches(branch_selector):
+        return
+
+    kwargs["header"] = defaults.get_value_from_kwargs("header", kwargs)
+    kwargs["repo"] = defaults.get_value_from_kwargs("repo", kwargs)
+    kwargs["refs"] = defaults.get_value_from_kwargs("refs", kwargs)
+    luci.console_view(
+        name = name,
+        **kwargs
+    )
+
+    _console_view_ordering(
+        console_name = name,
+        ordering = ordering or {},
+    )
+
+def overview_console_view(*, name, top_level_ordering, branch_selector = branches.MAIN, **kwargs):
+    """Create an overview console view.
+
+    An overview console view is a console view that contains a subset of
+    entries from other consoles. The entries from each console will have
+    that console's name prepended to the entries' categories and will
+    appear in the same order as they do in that console. The ordering of
+    entries from different consoles is controlled by the
+    `top_level_ordering` parameter.
+
+    Args:
+      name - The name of the console view.
+      top_level_ordering - A list of strings defining the order that
+        entries from different consoles will appear. Entries will be
+        sorted by the name of the console they come from, appearing in the
+        same order as in top_level_ordering. Entries from consoles whose
+        name does not appear in the list will be sorted lexicographically
+        by the console name and appear after entries whose console does
+        appear in the list.
+      branch_selector - A branch selector value controlling whether the
+        console view definition is executed. See branches.star for
+        more information.
+      kwargs - Additional keyword arguments to forward on to
+        `luci.console_view`. The header and repo arguments support
+         module-level defaults.
+    """
+    kwargs["header"] = defaults.get_value_from_kwargs("header", kwargs)
+    kwargs["repo"] = defaults.get_value_from_kwargs("repo", kwargs)
+    luci.console_view(
+        name = name,
+        **kwargs
+    )
+
+    _overview_console_view_ordering(
+        console_name = name,
+        top_level_ordering = top_level_ordering,
+    )
+
+def console_view_entry(
+        *,
+        branch_selector = branches.ALL_BRANCHES,
+        console_view = None,
+        category = None,
+        short_name = None):
+    """Specifies the details of a console view entry.
+
+    See https://chromium.googlesource.com/infra/luci/luci-go/+/refs/heads/master/lucicfg/doc/README.md#luci.console_view_entry
+    for more details on the arguments.
+
+    Args:
+      branch_selector - A branch selector value controlling whether
+        console view entry definition is executed. The console view
+        entry is only defined if the associated builder is defined based
+        on its branch selector value. By default, the console view entry
+        will be defined whenever the associated builder is defined. See
+        branches.star for more information.
+      console_view - The console view to add an entry for the associated
+        builder to. By default, the entry will be for a console with the
+        same name as the builder's builder group, which the builder must
+        have. At most one `console_view_entry` for a builder can omit
+        the `console_view` value.
+      category - The category of the builder in the console.
+      short_name - The short name of the builder in the console.
+
+    Returns:
+      A struct that can be passed to the `console_view_entry` argument
+      of `builders.builder` in order to create a console view entry for
+      the builder.
+    """
+    return struct(
+        branch_selector = branch_selector,
+        console_view = console_view,
+        category = category,
+        short_name = short_name,
+    )
+
+def _sorted_list_view_graph_key(console_name):
+    return graph.key("@chromium", "", "sorted_list_view", console_name)
+
+def _get_list_view_key_fn(console_name):
+    sorted_list_view = graph.node(_sorted_list_view_graph_key(console_name))
+    if sorted_list_view == None:
+        return None
+    return lambda b: b.name
+
+def _sorted_list_view_impl(ctx, *, console_name):
+    key = _sorted_list_view_graph_key(console_name)
+    graph.add_node(key)
+    graph.add_edge(keys.project(), key)
+    return graph.keyset(key)
+
+_sorted_list_view = lucicfg.rule(impl = _sorted_list_view_impl)
+
+def list_view(*, name, branch_selector = branches.MAIN, **kwargs):
+    """Create a sorted list view.
+
+    The entries in the list view will be sorted by the builder's name.
+
+    Args:
+      name - The name of the list view.
+      branch_selector - A branch selector value controlling whether the
+        console view definition is executed. See branches.star for
+        more information.
+      kwargs - Additional keyword arguments to forward on to
+        `luci.list_view`.
+    """
+    if not branches.matches(branch_selector):
+        return
+
+    luci.list_view(
+        name = name,
+        **kwargs
+    )
+
+    _sorted_list_view(
+        console_name = name,
+    )
+
+def _sort_consoles(ctx):
+    milo = ctx.output["luci-milo.cfg"]
+    consoles = []
+    for console in milo.consoles:
+        if not console.builders:
+            continue
+        key_fn = (_get_console_view_key_fn(console.id) or
+                  _get_overview_console_view_key_fn(console.id) or
+                  _get_list_view_key_fn(console.id))
+        if key_fn:
+            console.builders = sorted(console.builders, key_fn)
+        consoles.append(console)
+
+lucicfg.generator(_sort_consoles)
+
+consoles = struct(
+    # Module-level defaults for consoles functions
+    defaults = defaults,
+
+    # Functions for declaring automatically maintained console views
+    console_view = console_view,
+    console_view_entry = console_view_entry,
+    ordering = ordering,
+    overview_console_view = overview_console_view,
+
+    # Functions for declaring automatically maintained list views
+    list_view = list_view,
+)
diff --git a/chromium/infra/config/lib/swarming.star b/chromium/infra/config/lib/swarming.star
index 7477a7feba8..1e5c796542d 100644
--- a/chromium/infra/config/lib/swarming.star
+++ b/chromium/infra/config/lib/swarming.star
@@ -12,7 +12,7 @@ def root_permissions():
     Noop on a non-main branch, since Swarming pools are owned by the primary
     Chromium project defined on the main branch.
     """
-    if not branches.matches(branches.MAIN_ONLY):
+    if not branches.matches(branches.MAIN):
         return
 
     # Allow admins to cancel any task, delete bots, etc. in any Chromium pool.
@@ -41,7 +41,7 @@ def pool_realm(*, name, groups = None, users = None, projects = None):
     Pools are owned by the main Chromium project and it makes sense to defined
     them only on the main branch. This declaration is noop on a non-main branch.
     """
-    if not branches.matches(branches.MAIN_ONLY):
+    if not branches.matches(branches.MAIN):
         return
     if not name.startswith("pools/"):
         fail("By convention Swarming pool realm name should start with pools/")
@@ -89,7 +89,7 @@ def task_triggerers(*, builder_realm, pool_realm, users = None, groups = None):
     """
 
     # Permission to submit tasks to Swarming at all.
-    if branches.matches(branches.MAIN_ONLY):
+    if branches.matches(branches.MAIN):
         luci.binding(
             realm = pool_realm,
             roles = "role/swarming.poolUser",
diff --git a/chromium/infra/config/lib/try.star b/chromium/infra/config/lib/try.star
index d004597a73b..63c0378f0a5 100644
--- a/chromium/infra/config/lib/try.star
+++ b/chromium/infra/config/lib/try.star
@@ -17,8 +17,6 @@ corresponding attribute on `defaults` that is a `lucicfg.var` that can be used
 to set the default value. Can also be accessed through `try_.defaults`.
 """
 
-load("@stdlib//internal/graph.star", "graph")
-load("@stdlib//internal/luci/common.star", "keys")
 load("./args.star", "args")
 load("./branches.star", "branches")
 load("./builders.star", "builders")
@@ -32,139 +30,12 @@ DEFAULT_EXCLUDE_REGEXPS = [
 
 defaults = args.defaults(
     extends = builders.defaults,
-    add_to_list_view = False,
     cq_group = None,
-    list_view = args.COMPUTE,
     main_list_view = None,
     subproject_list_view = None,
+    resultdb_bigquery_exports = [],
 )
 
-def declare_bucket(milestone_vars, *, branch_selector = branches.MAIN_ONLY):
-    if not branches.matches(branch_selector):
-        return
-
-    luci.bucket(
-        name = milestone_vars.try_bucket,
-        acls = [
-            acl.entry(
-                roles = acl.BUILDBUCKET_READER,
-                groups = "all",
-            ),
-            acl.entry(
-                roles = acl.BUILDBUCKET_TRIGGERER,
-                users = [
-                    "findit-for-me@appspot.gserviceaccount.com",
-                    "tricium-prod@appspot.gserviceaccount.com",
-                ],
-                groups = [
-                    "project-chromium-tryjob-access",
-                    # Allow Pinpoint to trigger builds for bisection
-                    "service-account-chromeperf",
-                    "service-account-cq",
-                ],
-                projects = milestone_vars.try_triggering_projects,
-            ),
-            acl.entry(
-                roles = acl.BUILDBUCKET_OWNER,
-                groups = "service-account-chromium-tryserver",
-            ),
-        ],
-    )
-
-    luci.cq_group(
-        name = milestone_vars.cq_group,
-        retry_config = cq.RETRY_ALL_FAILURES,
-        tree_status_host = milestone_vars.tree_status_host,
-        watch = cq.refset(
-            repo = "https://chromium.googlesource.com/chromium/src",
-            refs = [milestone_vars.cq_ref_regexp],
-        ),
-        acls = [
-            acl.entry(
-                acl.CQ_COMMITTER,
-                groups = "project-chromium-committers",
-            ),
-            acl.entry(
-                acl.CQ_DRY_RUNNER,
-                groups = "project-chromium-tryjob-access",
-            ),
-        ],
-    )
-
-    try_.list_view(
-        name = milestone_vars.main_list_view_name,
-        branch_selector = branch_selector,
-        title = milestone_vars.main_list_view_title,
-    )
-
-def set_defaults(milestone_vars, **kwargs):
-    default_values = dict(
-        add_to_list_view = milestone_vars.is_master,
-        bucket = milestone_vars.try_bucket,
-        build_numbers = True,
-        caches = [
-            swarming.cache(
-                name = "win_toolchain",
-                path = "win_toolchain",
-            ),
-        ],
-        configure_kitchen = True,
-        cores = 8,
-        cpu = builders.cpu.X86_64,
-        cq_group = milestone_vars.cq_group,
-        executable = "recipe:chromium_trybot",
-        execution_timeout = 4 * time.hour,
-        # Max. pending time for builds. CQ considers builds pending >2h as timed
-        # out: http://shortn/_8PaHsdYmlq. Keep this in sync.
-        expiration_timeout = 2 * time.hour,
-        os = builders.os.LINUX_DEFAULT,
-        pool = "luci.chromium.try",
-        service_account = "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com",
-        swarming_tags = ["vpython:native-python-wrapper"],
-        task_template_canary_percentage = 5,
-    )
-    default_values.update(kwargs)
-    for k, v in default_values.items():
-        getattr(defaults, k).set(v)
-
-def _sorted_list_view_graph_key(console_name):
-    return graph.key("@chromium", "", "sorted_list_view", console_name)
-
-def _sorted_list_view_impl(ctx, *, console_name):
-    key = _sorted_list_view_graph_key(console_name)
-    graph.add_node(key)
-    graph.add_edge(keys.project(), key)
-    return graph.keyset(key)
-
-_sorted_list_view = lucicfg.rule(impl = _sorted_list_view_impl)
-
-def _sort_console_entries(ctx):
-    milo = ctx.output["luci-milo.cfg"]
-    consoles = []
-    for console in milo.consoles:
-        if not console.builders:
-            continue
-        graph_key = _sorted_list_view_graph_key(console.id)
-        node = graph.node(graph_key)
-        if node:
-            console.builders = sorted(console.builders, lambda b: b.name)
-        consoles.append(console)
-
-lucicfg.generator(_sort_console_entries)
-
-def list_view(*, name, branch_selector = branches.MAIN_ONLY, **kwargs):
-    if not branches.matches(branch_selector):
-        return
-
-    luci.list_view(
-        name = name,
-        **kwargs
-    )
-
-    _sorted_list_view(
-        console_name = name,
-    )
-
 def tryjob(
         *,
         disable_reuse = None,
@@ -201,13 +72,14 @@ def tryjob(
 def try_builder(
         *,
         name,
-        branch_selector = branches.MAIN_ONLY,
-        add_to_list_view = args.DEFAULT,
+        branch_selector = branches.MAIN,
         cq_group = args.DEFAULT,
         list_view = args.DEFAULT,
         main_list_view = args.DEFAULT,
         subproject_list_view = args.DEFAULT,
         tryjob = None,
+        experiments = None,
+        resultdb_bigquery_exports = args.DEFAULT,
         **kwargs):
     """Define a try builder.
 
@@ -216,38 +88,76 @@ def try_builder(
       branch_selector - A branch selector value controlling whether the
         builder definition is executed. See branches.star for more
         information.
-      add_to_list_view - A bool indicating whether an entry should be
-        created for the builder in the console identified by
-        `list_view`. Supports a module-level default that defaults to
-        False.
       cq_group - The CQ group to add the builder to. If tryjob is None, it will
         be added as includable_only.
-      list_view - A string identifying the ID of the list view to
-        add an entry to. Supports a module-level default that defaults to
-        the group of the builder, if provided. An entry will be added
-        only if `add_to_list_view` is True.
+      list_view - A string or list of strings identifying the ID(s) of the list
+        view to add an entry to. Supports a module-level default that defaults
+        to the group of the builder, if provided.
       main_console_view - A string identifying the ID of the main list
         view to add an entry to. Supports a module-level default that
-        defaults to None. Note that `add_to_list_view` has no effect on
-        adding an entry to the main list view.
+        defaults to None.
       subproject_list_view - A string identifying the ID of the
         subproject list view to add an entry to. Suppoers a module-level
-        default that defaults to None. Not that `add_to_list_view` has
-        no effect on adding an entry to the subproject list view.
+        default that defaults to None.
       tryjob - A struct containing the details of the tryjob verifier for the
         builder, obtained by calling the `tryjob` function.
+      experiments - a dict of experiment name to the percentage chance (0-100)
+        that it will apply to builds generated from this builder.
+      resultdb_bigquery_exports - a list of resultdb.export_test_results(...)
+        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
     """
     if not branches.matches(branch_selector):
         return
 
+    # Enable "chromium.resultdb.result_sink" on try builders at 50%.
+    experiments = experiments or {}
+    experiments.setdefault("chromium.resultdb.result_sink", 50)
+
+    merged_resultdb_bigquery_exports = [
+        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",
+            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/.+",
+            ),
+        ),
+    ]
+    merged_resultdb_bigquery_exports.extend(
+        defaults.get_value(
+            "resultdb_bigquery_exports",
+            resultdb_bigquery_exports,
+        ),
+    )
+
+    list_view = defaults.get_value("list_view", list_view)
+    if list_view == args.COMPUTE:
+        list_view = defaults.get_value_from_kwargs("builder_group", kwargs)
+    if type(list_view) == type(""):
+        list_view = [list_view]
+    list_view = list(list_view or [])
+    main_list_view = defaults.get_value("main_list_view", main_list_view)
+    if main_list_view:
+        list_view.append(main_list_view)
+    subproject_list_view = defaults.get_value("subproject_list_view", subproject_list_view)
+    if subproject_list_view:
+        list_view.append(subproject_list_view)
+
     # Define the builder first so that any validation of luci.builder arguments
     # (e.g. bucket) occurs before we try to use it
     builders.builder(
         name = name,
         branch_selector = branch_selector,
-        resultdb_bigquery_exports = [resultdb.export_test_results(
-            bq_table = "luci-resultdb.chromium.try_test_results",
-        )],
+        list_view = list_view,
+        resultdb_bigquery_exports = merged_resultdb_bigquery_exports,
+        experiments = experiments,
         **kwargs
     )
 
@@ -272,37 +182,6 @@ def try_builder(
             includable_only = True,
         )
 
-    add_to_list_view = defaults.get_value("add_to_list_view", add_to_list_view)
-    if add_to_list_view:
-        list_view = defaults.get_value("list_view", list_view)
-        if list_view == args.COMPUTE:
-            list_view = defaults.get_value_from_kwargs("builder_group", kwargs)
-
-        if list_view:
-            add_to_list_view = defaults.get_value(
-                "add_to_list_view",
-                add_to_list_view,
-            )
-
-            luci.list_view_entry(
-                builder = builder,
-                list_view = list_view,
-            )
-
-    main_list_view = defaults.get_value("main_list_view", main_list_view)
-    if main_list_view:
-        luci.list_view_entry(
-            builder = builder,
-            list_view = main_list_view,
-        )
-
-    subproject_list_view = defaults.get_value("subproject_list_view", subproject_list_view)
-    if subproject_list_view:
-        luci.list_view_entry(
-            builder = builder,
-            list_view = subproject_list_view,
-        )
-
 def blink_builder(*, name, goma_backend = None, **kwargs):
     return try_builder(
         name = name,
@@ -404,26 +283,19 @@ def chromium_mac_builder(
 def chromium_mac_ios_builder(
         *,
         name,
-        caches = None,
         executable = "recipe:chromium_trybot",
         goma_backend = builders.goma.backend.RBE_PROD,
         os = builders.os.MAC_10_15,
-        properties = None,
+        xcode = builders.xcode.x12a7209,
         **kwargs):
-    caches = caches or [builders.xcode_cache.x12a7209]
-
-    properties = properties or {}
-    properties.setdefault("xcode_build_version", "12a7209")
-
     return try_builder(
         name = name,
         builder_group = "tryserver.chromium.mac",
-        caches = caches,
         cores = None,
         executable = executable,
         goma_backend = goma_backend,
         os = os,
-        properties = properties,
+        xcode = xcode,
         **kwargs
     )
 
@@ -525,12 +397,14 @@ def gpu_chromium_win_builder(*, name, os = builders.os.WINDOWS_ANY, **kwargs):
     )
 
 try_ = struct(
+    # Module-level defaults for try functions
     defaults = defaults,
+
+    # Functions for declaring try builders
     builder = try_builder,
-    declare_bucket = declare_bucket,
     job = tryjob,
-    list_view = list_view,
-    set_defaults = set_defaults,
+
+    # More specific builder wrapper functions
     blink_builder = blink_builder,
     blink_mac_builder = blink_mac_builder,
     chromium_builder = chromium_builder,
diff --git a/chromium/infra/config/main.star b/chromium/infra/config/main.star
index 866086b1d2f..6dbd2f111e4 100755
--- a/chromium/infra/config/main.star
+++ b/chromium/infra/config/main.star
@@ -32,6 +32,7 @@ lucicfg.config(
         "luci-notify.cfg",
         "luci-notify/email-templates/*.template",
         "luci-scheduler.cfg",
+        "outages.pyl",
         "project.cfg",
         "project.pyl",
         "realms.cfg",
@@ -134,21 +135,6 @@ branches.exec("//subprojects/webrtc/subproject.star")
 
 branches.exec("//generators/cq-builders-md.star")
 
-# This should be exec'ed before exec'ing scheduler-noop-jobs.star because
-# attempting to read the buildbucket field that is not set for the noop jobs
-# actually causes an empty buildbucket message to be set
-# TODO(https://crbug.com/1062385) The automatic generation of job IDs causes
-# problems when the number of builders with the same name goes from 1 to >1 or
-# vice-versa. This generator makes sure both the bucketed and non-bucketed IDs
-# work so that there aren't transient failures when the configuration changes
-branches.exec("//generators/scheduler-bucketed-jobs.star")
-
-# TODO(https://crbug.com/819899) There are a number of noop jobs for dummy
-# builders defined due to legacy requirements that trybots mirror CI bots
-# no-op scheduler jobs are not supported by the lucicfg libraries, so this
-# generator adds in the necessary no-op jobs
-# The trybots should be update to not require no-op jobs to be triggered so that
-# the no-op jobs can be removed
 exec("//generators/scheduler-noop-jobs.star")
 exec("//generators/sort-consoles.star")
 
diff --git a/chromium/infra/config/notifiers.star b/chromium/infra/config/notifiers.star
index c2307a394f1..844884d8314 100644
--- a/chromium/infra/config/notifiers.star
+++ b/chromium/infra/config/notifiers.star
@@ -13,6 +13,14 @@ luci.notifier(
 )
 
 luci.notifier(
+    name = "chrome-memory-safety",
+    on_status_change = True,
+    notify_emails = [
+        "chrome-memory-safety+bots@google.com",
+    ],
+)
+
+luci.notifier(
     name = "chrome-memory-sheriffs",
     on_status_change = True,
     notify_emails = [
@@ -43,6 +51,14 @@ luci.notifier(
     notify_emails = ["chromium-component-mapping@google.com"],
 )
 
+luci.notifier(
+    name = "weblayer-sheriff",
+    on_new_status = ["FAILURE"],
+    notify_emails = [
+        "weblayer-sheriff@grotations.appspotmail.com",
+    ],
+)
+
 TREE_CLOSING_STEPS = [
     "bot_update",
     "compile",
@@ -63,7 +79,7 @@ def _empty_notifier(*, name):
     )
 
 def tree_closer(*, name, tree_status_host, **kwargs):
-    if branches.matches(branches.MAIN_ONLY):
+    if branches.matches(branches.MAIN):
         luci.tree_closer(
             name = name,
             tree_status_host = tree_status_host,
@@ -84,7 +100,7 @@ tree_closer(
 )
 
 def tree_closure_notifier(*, name, **kwargs):
-    if branches.matches(branches.MAIN_ONLY):
+    if branches.matches(branches.MAIN):
         luci.notifier(
             name = name,
             on_occurrence = ["FAILURE"],
@@ -109,7 +125,7 @@ tree_closure_notifier(
     name = "gpu-tree-closer-email",
     notify_emails = ["chrome-gpu-build-failures@google.com"],
     notify_rotation_urls = [
-        "https://rota-ng.appspot.com/legacy/sheriff_gpu.json",
+        "https://chrome-ops-rotation-proxy.appspot.com/current/grotation:chrome-gpu-pixel-wrangling",
     ],
 )
 
@@ -150,26 +166,6 @@ tree_closure_notifier(
 )
 
 luci.notifier(
-    name = "Closure Compilation Linux",
-    notify_emails = [
-        "dbeam+closure-bots@chromium.org",
-        "fukino+closure-bots@chromium.org",
-        "hirono+closure-bots@chromium.org",
-        "vitalyp@chromium.org",
-    ],
-    on_occurrence = ["FAILURE"],
-    failed_step_regexp = [
-        "update_scripts",
-        "setup_build",
-        "bot_update",
-        "generate_gyp_files",
-        "compile",
-        "generate_v2_gyp_files",
-        "compile_v2",
-    ],
-)
-
-luci.notifier(
     name = "Site Isolation Android",
     notify_emails = [
         "nasko+fyi-bots@chromium.org",
diff --git a/chromium/infra/config/outages/README.md b/chromium/infra/config/outages/README.md
index 11423046c4b..5f61e049c80 100644
--- a/chromium/infra/config/outages/README.md
+++ b/chromium/infra/config/outages/README.md
@@ -29,3 +29,27 @@ available parameters are:
   other workarounds to improve the CQ experience for developers rather than
   tracking down which experimental tryjobs would be using the capacity that is
   needed for the particular outage.
+
+# Making changes during an outage
+
+If you attempt to make a configuration change while an outages configuration is
+enabled then the actual effect of your change may not be apparent if the outages
+configuration impacts the portion of the configuration that you are modifying.
+To prevent someone from unknowingly making such a change, a presubmit check will
+prevent changes from being landed if there is an outages configuration in effect
+unless all of the following are true:
+
+* 1 or more LUCI configuration files within //infra/config/outages are modified.
+* 0 or more LUCI configuration files within //infra/config/generated are
+  modified.
+* 0 other LUCI configuration files within //infra/config are modified.
+
+If an outages configuration is in effect and you need to make a change that
+doesn't meet these conditions to try and address the outage, add the footer
+`Infra-Config-Outage-Action`. The value for the footer should be some link that
+provides context on the outage being addressed.
+
+If an outages configuration is in effect and you need to make an unrelated
+change that cannot wait until the outage has been addressed, add the footer
+`Infra-Config-Ignore-Outage`. The value for the footer should explain why it is
+necessary to make such a change.
diff --git a/chromium/infra/config/outages/config.star b/chromium/infra/config/outages/config.star
index 423dfc2d46c..07816a0e636 100644
--- a/chromium/infra/config/outages/config.star
+++ b/chromium/infra/config/outages/config.star
@@ -7,6 +7,10 @@ def _outages_config(*, disable_cq_experiments = False):
         disable_cq_experiments = disable_cq_experiments,
     )
 
+# The default value that is used by a generator to compare against the current
+# config to output the effective outages configuration
+DEFAULT_CONFIG = _outages_config()
+
 # See README.md for documentation on allowable configuration values
 config = _outages_config(
 )
diff --git a/chromium/infra/config/outages/outages.star b/chromium/infra/config/outages/outages.star
index df27cb65c39..cf2dd0c400c 100644
--- a/chromium/infra/config/outages/outages.star
+++ b/chromium/infra/config/outages/outages.star
@@ -2,9 +2,24 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-load("./config.star", "config")
+load("./config.star", "DEFAULT_CONFIG", "config")
 load("@stdlib//internal/luci/proto.star", "cq_pb")
 
+def _generate_outages_file(ctx):
+    config_to_write = {}
+    for a in dir(config):
+        value = getattr(config, a)
+        if value != getattr(DEFAULT_CONFIG, a):
+            config_to_write[a] = value
+    ctx.output["outages.pyl"] = "\n".join([
+        "# This is a non-LUCI generated file",
+        "# This details the current configuration modifications for outages settings",
+        repr(config_to_write),
+        "",
+    ])
+
+lucicfg.generator(_generate_outages_file)
+
 def _disable_cq_experiments(ctx):
     if not config.disable_cq_experiments:
         return
@@ -12,15 +27,14 @@ def _disable_cq_experiments(ctx):
     for c in ctx.output["commit-queue.cfg"].config_groups:
         if c.verifiers.tryjob == cq_pb.Verifiers.Tryjob():
             # Accessing the tryjob field where it wasn't set causes it to be set
-            # to an empty message and added to the output, setting to None
-            # prevents the change to the output
+            # to an empty message and added to the output
             c.verifiers.tryjob = None
             continue
         for b in c.verifiers.tryjob.builders:
             if not b.experiment_percentage:
                 continue
             project, bucket, builder = b.name.split("/", 2)
-            if project == "chromium" and bucket in ("try", "try-m85"):
+            if project == "chromium" and bucket == "try":
                 b.includable_only = True
                 b.experiment_percentage = 0
                 b.location_regexp.clear()
diff --git a/chromium/infra/config/project.star b/chromium/infra/config/project.star
index 39bf1347401..8aa442e6854 100644
--- a/chromium/infra/config/project.star
+++ b/chromium/infra/config/project.star
@@ -2,26 +2,72 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-settings = struct(
-    project = "chromium-m87",
-    # Switch this to False for branches
+def _project_settings(
+        *,
+        project,
+        branch_title,
+        is_master,
+        is_lts_branch,
+        ref,
+        cq_ref_regexp,
+        try_triggering_projects,
+        tree_status_host):
+    """Declare settings for the project.
+
+    This provides the central location for what must be modified when
+    setting up the project for a new branch or when a branch changes category
+    (e.g. moves from a standard release channel to the long-term support
+    channel).
+
+    Args:
+      * project - The name of the LUCI project.
+      * branch_title - A string identifying the branch in console titles.
+      * is_master - Whether this branch is main/master/trunk.
+      * is_lts_branch - Whether this branch is in the LTS channel.
+      * ref - The git ref containing the code for this branch.
+      * cq_ref_regexp - A regular expression determining the git refs that the
+        CQ group for this project should watch.
+      * try_trigger_projects - A list of names of other LUCI projects whose CQ
+        is allowed to trigger this project's try builders. None can also be
+        passed to prohibit other projects' CQ from triggering this project's try
+        builders.
+      * tree_status_host - The host of the tree status app associated with this
+        project. Builders with tree closers configured will notify this host and
+        CQ attempts will block if the host indicates the tree is closed. It also
+        appears at the top of the console header. None indicates there is no
+        associated tree status app for the project.
+    """
+    if is_master and is_lts_branch:
+        fail("is_master and is_lts_branch can't both be True")
+    return struct(
+        project = project,
+        is_master = is_master,
+        is_lts_branch = is_lts_branch,
+        ref = ref,
+        cq_ref_regexp = cq_ref_regexp,
+        try_triggering_projects = try_triggering_projects,
+        tree_status_host = tree_status_host,
+        main_console_title = "{} Main Console".format(branch_title),
+        cq_mirrors_console_title = "{} CQ Mirrors Console".format(branch_title),
+        main_list_view_title = "{} CQ Console".format(branch_title),
+    )
+
+settings = _project_settings(
+    # Set this to the name of the milestone's project
+    project = "chromium-m88",
+    # Set this to how the branch should be referred to in console titles
+    branch_title = "Chromium M88",
+    # Set this to False for branches
     is_master = False,
-    # Switch this to True for LTC/LTS branches
+    # Set this to True for LTC/LTS branches
     is_lts_branch = False,
-    ref = "refs/branch-heads/4280",
-    ci_bucket = "ci",
-    ci_poller = "chromium-gitiles-trigger",
-    main_console_name = "main",
-    main_console_title = "Chromium M87 Main Console",
-    cq_mirrors_console_name = "mirrors",
-    cq_mirrors_console_title = "Chromium M87 CQ Mirrors Console",
-    try_bucket = "try",
-    try_triggering_projects = [],
-    cq_group = "cq",
-    cq_ref_regexp = "refs/branch-heads/4280",
-    main_list_view_name = "try",
-    main_list_view_title = "Chromium M87 CQ console",
-    # Switch this to None for branches
+    # Set this to the branch ref for branches
+    ref = "refs/branch-heads/4324",
+    # Set this to the branch ref for branches
+    cq_ref_regexp = "refs/branch-heads/4324",
+    # Set this to None for branches
+    try_triggering_projects = None,
+    # Set this to None for branches
     tree_status_host = None,
 )
 
@@ -41,12 +87,37 @@ def _generate_project_pyl(ctx):
 
 lucicfg.generator(_generate_project_pyl)
 
+def _milestone_details(*, project, ref, channel):
+    """Define the details for an active milestone.
+
+    Args:
+      * project - The name of the LUCI project that is configured for the
+        milestone.
+      * ref - The ref in the git repository that contains the code for the
+        milestone.
+      * channel - The name of the release channel the milestone is in (used for
+        identifying the milestone in the console header).
+    """
+    return struct(
+        project = project,
+        ref = ref,
+        channel = channel,
+    )
+
 # The milestone names and branch numbers of branches that we have builders
 # running for (including milestone-specific projects)
 # Branch numbers and milestones can be viewed in the chromium column at
 # https://chromiumdash.appspot.com/branches
 # The 2 highest milestones will be the ones with active branches
-ACTIVE_BRANCHES = [
-    ("m85", 4183),
-    ("m86", 4240),
-]
+ACTIVE_MILESTONES = {
+    "m86": _milestone_details(
+        project = "chromium-m86",
+        ref = "refs/branch-heads/4240",
+        channel = "Stable",
+    ),
+    "m87": _milestone_details(
+        project = "chromium-m87",
+        ref = "refs/branch-heads/4280",
+        channel = "Beta",
+    ),
+}
diff --git a/chromium/infra/config/recipes.star b/chromium/infra/config/recipes.star
index 4b84bd997de..15cf980d015 100644
--- a/chromium/infra/config/recipes.star
+++ b/chromium/infra/config/recipes.star
@@ -28,6 +28,10 @@ build_recipe = _recipe_for_package(
 )
 
 build_recipe(
+    name = "recipe:android/androidx_packager",
+)
+
+build_recipe(
     name = "recipe:android/avd_packager",
 )
 
@@ -60,6 +64,12 @@ build_recipe(
 )
 
 build_recipe(
+    name = "recipe:chromium (bbagent)",
+    recipe = "chromium",
+    use_bbagent = True,
+)
+
+build_recipe(
     name = "recipe:chromium_afl",
 )
 
@@ -94,10 +104,6 @@ build_recipe(
 )
 
 build_recipe(
-    name = "recipe:closure_compilation",
-)
-
-build_recipe(
     name = "recipe:cronet",
 )
 
@@ -134,5 +140,9 @@ build_recipe(
 )
 
 build_recipe(
+    name = "recipe:tricium_simple",
+)
+
+build_recipe(
     name = "recipe:webrtc/chromium_ios",
 )
diff --git a/chromium/infra/config/subprojects/chromium/ci.star b/chromium/infra/config/subprojects/chromium/ci.star
index b844e2cbe9d..ddde35b066b 100644
--- a/chromium/infra/config/subprojects/chromium/ci.star
+++ b/chromium/infra/config/subprojects/chromium/ci.star
@@ -3,28 +3,100 @@
 # found in the LICENSE file.
 
 load("//lib/branches.star", "branches")
-load("//lib/builders.star", "builder_name", "cpu", "goma", "os", "xcode_cache")
+load("//lib/builders.star", "builder_name", "cpu", "goma", "os", "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 None if settings.is_master else settings.main_console_name
+    return branches.value(for_branches = "main")
 
-ci.set_defaults(
-    settings,
-    add_to_console_view = True,
+ci.defaults.set(
+    bucket = "ci",
+    build_numbers = True,
+    configure_kitchen = True,
+    cores = 8,
+    cpu = cpu.X86_64,
+    executable = "recipe:chromium",
+    execution_timeout = 3 * time.hour,
+    os = os.LINUX_DEFAULT,
+    pool = "luci.chromium.ci",
+    project_trigger_overrides = branches.value(for_branches = {"chromium": settings.project}),
+    service_account = "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
+    swarming_tags = ["vpython:native-python-wrapper"],
+    triggered_by = ["chromium-gitiles-trigger"],
+    # TODO(crbug.com/1129723): set default goma_backend here.
+)
+
+consoles.defaults.set(
+    header = HEADER,
+    repo = "https://chromium.googlesource.com/chromium/src",
+    refs = [settings.ref],
+)
+
+luci.bucket(
+    name = "ci",
+    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.declare_bucket(settings, branch_selector = branches.ALL_RELEASES)
+luci.gitiles_poller(
+    name = "chromium-gitiles-trigger",
+    bucket = "ci",
+    repo = "https://chromium.googlesource.com/chromium/src",
+    refs = [settings.ref],
+)
 
 # Automatically maintained consoles
 
-ci.console_view(
+[consoles.overview_console_view(
+    name = name,
+    repo = "https://chromium.googlesource.com/chromium/src",
+    refs = [settings.ref],
+    title = title,
+    top_level_ordering = [
+        "chromium",
+        "chromium.win",
+        "chromium.mac",
+        "chromium.linux",
+        "chromium.chromiumos",
+        "chromium.android",
+        "chrome",
+        "chromium.memory",
+        "chromium.dawn",
+        "chromium.gpu",
+        "chromium.fyi",
+        "chromium.android.fyi",
+        "chromium.clang",
+        "chromium.fuzz",
+        "chromium.gpu.fyi",
+        "chromium.swangle",
+        "chromium.updater",
+    ],
+) for name, title in (
+    ("main", settings.main_console_title),
+    ("mirrors", settings.cq_mirrors_console_title),
+)]
+
+consoles.console_view(
     name = "chromium",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     include_experimental_builds = True,
     ordering = {
-        "*type*": ci.ordering(short_names = ["dbg", "rel", "off"]),
+        "*type*": consoles.ordering(short_names = ["dbg", "rel", "off"]),
         "android": "*type*",
         "fuchsia": "*type*",
         "linux": "*type*",
@@ -33,38 +105,38 @@ ci.console_view(
     },
 )
 
-ci.console_view(
+consoles.console_view(
     name = "chromium.android",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     ordering = {
         None: ["cronet", "builder", "tester"],
         "*cpu*": ["arm", "arm64", "x86"],
         "cronet": "*cpu*",
         "builder": "*cpu*",
-        "builder|det": ci.ordering(short_names = ["rel", "dbg"]),
+        "builder|det": consoles.ordering(short_names = ["rel", "dbg"]),
         "tester": ["phone", "tablet"],
-        "builder_tester|arm64": ci.ordering(short_names = ["M proguard"]),
+        "builder_tester|arm64": consoles.ordering(short_names = ["M proguard"]),
     },
 )
 
-ci.console_view(
+consoles.console_view(
     name = "chromium.android.fyi",
     ordering = {
         None: ["android", "memory", "weblayer", "webview"],
     },
 )
 
-ci.console_view(
+consoles.console_view(
     name = "chromium.chromiumos",
-    branch_selector = branches.ALL_RELEASES,
+    branch_selector = branches.ALL_BRANCHES,
     ordering = {
         None: ["default"],
-        "default": ci.ordering(short_names = ["ful", "rel"]),
+        "default": consoles.ordering(short_names = ["ful", "rel"]),
         "simple": ["release", "debug"],
     },
 )
 
-ci.console_view(
+consoles.console_view(
     name = "chromium.clang",
     ordering = {
         None: [
@@ -74,29 +146,29 @@ ci.console_view(
             "ToT Windows",
             "ToT Code Coverage",
         ],
-        "ToT Linux": ci.ordering(
+        "ToT Linux": consoles.ordering(
             short_names = ["rel", "ofi", "dbg", "asn", "fuz", "msn", "tsn"],
         ),
-        "ToT Android": ci.ordering(short_names = ["rel", "dbg", "x64"]),
-        "ToT Mac": ci.ordering(short_names = ["rel", "ofi", "dbg"]),
-        "ToT Windows": ci.ordering(
+        "ToT Android": consoles.ordering(short_names = ["rel", "dbg", "x64"]),
+        "ToT Mac": consoles.ordering(short_names = ["rel", "ofi", "dbg"]),
+        "ToT Windows": consoles.ordering(
             short_names = ["rel", "ofi"],
             categories = ["x64"],
         ),
-        "ToT Windows|x64": ci.ordering(short_names = ["rel"]),
-        "CFI|Win": ci.ordering(short_names = ["x86", "x64"]),
+        "ToT Windows|x64": consoles.ordering(short_names = ["rel"]),
+        "CFI|Win": consoles.ordering(short_names = ["x86", "x64"]),
         "iOS": ["public"],
-        "iOS|public": ci.ordering(short_names = ["sim", "dev"]),
+        "iOS|public": consoles.ordering(short_names = ["sim", "dev"]),
     },
 )
 
-ci.console_view(
+consoles.console_view(
     name = "chromium.dawn",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     ordering = {
         None: ["ToT"],
         "*builder*": ["Builder"],
-        "*cpu*": ci.ordering(short_names = ["x86"]),
+        "*cpu*": consoles.ordering(short_names = ["x86"]),
         "ToT|Mac": "*builder*",
         "ToT|Windows|Builder": "*cpu*",
         "ToT|Windows|Intel": "*cpu*",
@@ -108,12 +180,11 @@ ci.console_view(
     },
 )
 
-ci.console_view(
+consoles.console_view(
     name = "chromium.fyi",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     ordering = {
         None: [
-            "closure_compilation",
             "code_coverage",
             "cronet",
             "mac",
@@ -129,18 +200,19 @@ ci.console_view(
             "viz",
             "win10",
             "win32",
+            "paeverywhere",
         ],
-        "code_coverage": ci.ordering(
-            short_names = ["and", "ann", "lnx", "lcr", "mac"],
+        "code_coverage": consoles.ordering(
+            short_names = ["and", "ann", "lnx", "lcr", "jcr", "mac"],
         ),
-        "mac": ci.ordering(short_names = ["bld", "15", "herm"]),
-        "deterministic|mac": ci.ordering(short_names = ["rel", "dbg"]),
-        "iOS|iOS13": ci.ordering(short_names = ["dev", "sim"]),
-        "linux|blink": ci.ordering(short_names = ["TD"]),
+        "mac": consoles.ordering(short_names = ["bld", "15", "herm"]),
+        "deterministic|mac": consoles.ordering(short_names = ["rel", "dbg"]),
+        "iOS|iOS13": consoles.ordering(short_names = ["dev", "sim"]),
+        "linux|blink": consoles.ordering(short_names = ["TD"]),
     },
 )
 
-ci.console_view(
+consoles.console_view(
     name = "chromium.fuzz",
     ordering = {
         None: [
@@ -153,12 +225,12 @@ ci.console_view(
             "linux msan",
             "linux tsan",
         ],
-        "*config*": ci.ordering(short_names = ["dbg", "rel"]),
+        "*config*": consoles.ordering(short_names = ["dbg", "rel"]),
         "win asan": "*config*",
         "mac asan": "*config*",
         "linux asan": "*config*",
         "linux asan|x64 v8-ARM": "*config*",
-        "libfuzz": ci.ordering(short_names = [
+        "libfuzz": consoles.ordering(short_names = [
             "chromeos-asan",
             "linux32",
             "linux32-dbg",
@@ -172,21 +244,21 @@ ci.console_view(
     },
 )
 
-ci.console_view(
+consoles.console_view(
     name = "chromium.gpu",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     ordering = {
         None: ["Windows", "Mac", "Linux"],
     },
 )
 
-ci.console_view(
+consoles.console_view(
     name = "chromium.gpu.fyi",
     ordering = {
         None: ["Windows", "Mac", "Linux"],
         "*builder*": ["Builder"],
-        "*type*": ci.ordering(short_names = ["rel", "dbg", "exp"]),
-        "*cpu*": ci.ordering(short_names = ["x86"]),
+        "*type*": consoles.ordering(short_names = ["rel", "dbg", "exp"]),
+        "*cpu*": consoles.ordering(short_names = ["x86"]),
         "Windows": "*builder*",
         "Windows|Builder": ["Release", "dEQP", "dx12vk", "Debug"],
         "Windows|Builder|Release": "*cpu*",
@@ -211,49 +283,49 @@ ci.console_view(
     },
 )
 
-ci.console_view(
+consoles.console_view(
     name = "chromium.linux",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     ordering = {
         None: ["release", "debug"],
-        "release": ci.ordering(short_names = ["bld", "tst", "nsl", "gcc"]),
-        "cast": ci.ordering(short_names = ["vid", "aud"]),
+        "release": consoles.ordering(short_names = ["bld", "tst", "nsl", "gcc"]),
+        "cast": consoles.ordering(short_names = ["vid", "aud"]),
     },
 )
 
-ci.console_view(
+consoles.console_view(
     name = "chromium.mac",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     ordering = {
         None: ["release"],
-        "release": ci.ordering(short_names = ["bld"]),
-        "debug": ci.ordering(short_names = ["bld"]),
-        "ios|default": ci.ordering(short_names = ["dev", "sim"]),
+        "release": consoles.ordering(short_names = ["bld"]),
+        "debug": consoles.ordering(short_names = ["bld"]),
+        "ios|default": consoles.ordering(short_names = ["dev", "sim"]),
     },
 )
 
-ci.console_view(
+consoles.console_view(
     name = "chromium.memory",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     ordering = {
         None: ["win", "mac", "linux", "cros"],
-        "*build-or-test*": ci.ordering(short_names = ["bld", "tst"]),
+        "*build-or-test*": consoles.ordering(short_names = ["bld", "tst"]),
         "linux|TSan v2": "*build-or-test*",
         "linux|asan lsan": "*build-or-test*",
-        "linux|webkit": ci.ordering(short_names = ["asn", "msn"]),
+        "linux|webkit": consoles.ordering(short_names = ["asn", "msn"]),
     },
 )
 
-ci.console_view(
+consoles.console_view(
     name = "chromium.mojo",
 )
 
-ci.console_view(
+consoles.console_view(
     name = "chromium.swangle",
     ordering = {
         None: ["DEPS", "ToT ANGLE", "ToT SwiftShader"],
         "*os*": ["Windows", "Mac"],
-        "*cpu*": ci.ordering(short_names = ["x86", "x64"]),
+        "*cpu*": consoles.ordering(short_names = ["x86", "x64"]),
         "DEPS": "*os*",
         "DEPS|Windows": "*cpu*",
         "DEPS|Linux": "*cpu*",
@@ -267,13 +339,17 @@ ci.console_view(
     },
 )
 
-ci.console_view(
+consoles.console_view(
+    name = "chromium.updater",
+)
+
+consoles.console_view(
     name = "chromium.win",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     ordering = {
         None: ["release", "debug"],
-        "debug|builder": ci.ordering(short_names = ["64", "32"]),
-        "debug|tester": ci.ordering(short_names = ["7", "10"]),
+        "debug|builder": consoles.ordering(short_names = ["64", "32"]),
+        "debug|tester": consoles.ordering(short_names = ["7", "10"]),
     },
 )
 
@@ -300,6 +376,7 @@ ci.console_view(
     category = "chrome",
     short_name = short_name,
 ) for name, short_name in (
+    ("lacros-chrome", "lcr"),
     ("linux-chromeos-chrome", "cro"),
     ("linux-chrome", "lnx"),
     ("mac-chrome", "mac"),
@@ -311,6 +388,14 @@ ci.console_view(
 # them, then lexicographically by their name
 
 ci.builder(
+    name = "android-androidx-packager",
+    executable = "recipe:android/androidx_packager",
+    schedule = "0 7,14,22 * * * *",
+    service_account = "chromium-cipd-builder@chops-service-accounts.iam.gserviceaccount.com",
+    triggered_by = [],
+)
+
+ci.builder(
     name = "android-avd-packager",
     executable = "recipe:android/avd_packager",
     properties = {
@@ -318,7 +403,9 @@ ci.builder(
             "tools/android/avd/proto/creation/generic_android23.textpb",
             "tools/android/avd/proto/creation/generic_android28.textpb",
             "tools/android/avd/proto/creation/generic_android29.textpb",
+            "tools/android/avd/proto/creation/generic_android30.textpb",
             "tools/android/avd/proto/creation/generic_playstore_android28.textpb",
+            "tools/android/avd/proto/creation/generic_playstore_android30.textpb",
         ],
     },
     schedule = "0 7 * * 0 *",
@@ -407,7 +494,7 @@ ci.builder(
 
 ci.android_builder(
     name = "Android ASAN (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "builder|arm",
         short_name = "san",
     ),
@@ -419,7 +506,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Android WebView L (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "tester|webview",
         short_name = "L",
     ),
@@ -428,60 +515,60 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Android WebView M (dbg)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "tester|webview",
         short_name = "M",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Android arm64 Builder (dbg)")],
 )
 
 ci.android_builder(
     name = "Android WebView N (dbg)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "tester|webview",
         short_name = "N",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Android arm64 Builder (dbg)")],
 )
 
 ci.android_builder(
     name = "Android WebView O (dbg)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "tester|webview",
         short_name = "O",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Android arm64 Builder (dbg)")],
 )
 
 ci.android_builder(
     name = "Android WebView P (dbg)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "tester|webview",
         short_name = "P",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Android arm64 Builder (dbg)")],
 )
 
 ci.android_builder(
     name = "Android arm Builder (dbg)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "builder|arm",
         short_name = "32",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     execution_timeout = 4 * time.hour,
     main_console_view = main_console_if_on_branch(),
     tree_closing = True,
@@ -489,12 +576,12 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Android arm64 Builder (dbg)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "builder|arm",
         short_name = "64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     goma_jobs = goma.jobs.MANY_JOBS_FOR_CI,
     execution_timeout = 5 * time.hour,
     main_console_view = main_console_if_on_branch(),
@@ -503,43 +590,43 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Android x64 Builder (dbg)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "builder|x86",
         short_name = "64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     execution_timeout = 5 * time.hour,
     main_console_view = main_console_if_on_branch(),
 )
 
 ci.android_builder(
     name = "Android x86 Builder (dbg)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "builder|x86",
         short_name = "32",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     execution_timeout = 4 * time.hour,
     main_console_view = main_console_if_on_branch(),
 )
 
 ci.android_builder(
     name = "Cast Android (dbg)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "on_cq",
         short_name = "cst",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     tree_closing = True,
 )
 
 ci.android_builder(
     name = "Deterministic Android",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "builder|det",
         short_name = "rel",
     ),
@@ -551,7 +638,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Deterministic Android (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "builder|det",
         short_name = "dbg",
     ),
@@ -563,7 +650,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Lollipop Phone Tester",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "tester|phone",
         short_name = "L",
     ),
@@ -575,7 +662,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Lollipop Tablet Tester",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "tester|tablet",
         short_name = "L",
     ),
@@ -587,19 +674,19 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Marshmallow 64 bit Tester",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "tester|phone",
         short_name = "M",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Android arm64 Builder (dbg)")],
 )
 
 ci.android_builder(
     name = "Marshmallow Tablet Tester",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "tester|tablet",
         short_name = "M",
     ),
@@ -611,31 +698,31 @@ ci.android_builder(
 
 ci.android_builder(
     name = "Nougat Phone Tester",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "tester|phone",
         short_name = "N",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Android arm64 Builder (dbg)")],
 )
 
 ci.android_builder(
     name = "Oreo Phone Tester",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "tester|phone",
         short_name = "O",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Android arm64 Builder (dbg)")],
 )
 
 ci.android_builder(
     name = "android-10-arm64-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "builder_tester|arm64",
         short_name = "10",
     ),
@@ -643,7 +730,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-arm64-proguard-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "builder_tester|arm64",
         short_name = "M proguard",
     ),
@@ -653,7 +740,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-bfcache-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "bfcache",
         short_name = "bfc",
     ),
@@ -662,7 +749,7 @@ ci.android_builder(
 ci.android_builder(
     name = "android-binary-size-generator",
     executable = "recipe:binary_size_generator_tot",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "builder|other",
         short_name = "size",
     ),
@@ -670,31 +757,31 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-cronet-arm-dbg",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "cronet|arm",
         short_name = "dbg",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     notifies = ["cronet"],
 )
 
 ci.android_builder(
     name = "android-cronet-arm-rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "cronet|arm",
         short_name = "rel",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     notifies = ["cronet"],
 )
 
 ci.android_builder(
     name = "android-cronet-arm64-dbg",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "cronet|arm64",
         short_name = "dbg",
     ),
@@ -703,7 +790,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-cronet-arm64-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "cronet|arm64",
         short_name = "rel",
     ),
@@ -712,7 +799,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-cronet-asan-arm-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "cronet|asan",
     ),
     notifies = ["cronet"],
@@ -720,12 +807,12 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-cronet-arm-rel-kitkat-tests",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "cronet|test",
         short_name = "k",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     notifies = ["cronet"],
     triggered_by = [builder_name("android-cronet-arm-rel")],
@@ -733,12 +820,12 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-cronet-arm-rel-lollipop-tests",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "cronet|test",
         short_name = "l",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     notifies = ["cronet"],
     triggered_by = [builder_name("android-cronet-arm-rel")],
@@ -747,7 +834,7 @@ ci.android_builder(
 # Runs on a specific machine with an attached phone
 ci.android_builder(
     name = "android-cronet-marshmallow-arm64-perf-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "cronet|test|perf",
         short_name = "m",
     ),
@@ -760,7 +847,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-cronet-arm64-rel-marshmallow-tests",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "cronet|test",
         short_name = "m",
     ),
@@ -770,7 +857,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-cronet-x86-dbg",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "cronet|x86",
         short_name = "dbg",
     ),
@@ -779,7 +866,7 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-cronet-x86-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "cronet|x86",
         short_name = "rel",
     ),
@@ -788,49 +875,49 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-incremental-dbg",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "tester|incremental",
     ),
 )
 
 ci.android_builder(
     name = "android-lollipop-arm-rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "on_cq",
         short_name = "L",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     tree_closing = True,
 )
 
 ci.android_builder(
     name = "android-marshmallow-arm64-rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "on_cq",
         short_name = "M",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     tree_closing = True,
 )
 
 ci.android_builder(
     name = "android-marshmallow-x86-rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "builder_tester|x86",
         short_name = "M",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
 )
 
 ci.android_builder(
     name = "android-marshmallow-x86-rel-non-cq",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "builder_tester|x86",
         short_name = "M_non-cq",
     ),
@@ -838,42 +925,42 @@ ci.android_builder(
 
 ci.android_builder(
     name = "android-nougat-arm64-rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "builder_tester|arm64",
         short_name = "N",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
 )
 
 ci.android_builder(
     name = "android-pie-arm64-dbg",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "tester|phone",
         short_name = "P",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Android arm64 Builder (dbg)")],
 )
 
 ci.android_builder(
     name = "android-pie-arm64-rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "on_cq",
         short_name = "P",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     tree_closing = True,
 )
 
 ci.android_fyi_builder(
     name = "android-pie-arm64-wpt-rel-non-cq",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "builder_tester|arm64",
         short_name = "P-WPT",
     ),
@@ -881,23 +968,61 @@ ci.android_fyi_builder(
 
 ci.android_builder(
     name = "android-pie-x86-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
+        category = "builder_tester|x86",
+        short_name = "P",
+    ),
+)
+
+ci.android_fyi_builder(
+    name = "android-inverse-fieldtrials-pie-x86-fyi-rel",
+    console_view_entry = consoles.console_view_entry(
         category = "builder_tester|x86",
+        short_name = "P-IFT",
+    ),
+)
+
+ci.android_fyi_builder(
+    name = "android-weblayer-10-x86-rel-tests",
+    console_view_entry = consoles.console_view_entry(
+        category = "tester|weblayer",
+        short_name = "10",
+    ),
+    triggered_by = ["android-weblayer-x86-fyi-rel"],
+    notifies = ["weblayer-sheriff"],
+)
+
+ci.android_fyi_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-x86-fyi-rel"],
+    notifies = ["weblayer-sheriff"],
+)
+
+ci.android_fyi_builder(
+    name = "android-weblayer-pie-x86-rel-tests",
+    console_view_entry = consoles.console_view_entry(
+        category = "tester|weblayer",
         short_name = "P",
     ),
+    triggered_by = ["android-weblayer-x86-fyi-rel"],
+    notifies = ["weblayer-sheriff"],
 )
 
 ci.android_fyi_builder(
-    name = "android-weblayer-pie-x86-fyi-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "weblayer",
-        short_name = "p-x86-rel",
+    name = "android-weblayer-x86-fyi-rel",
+    console_view_entry = consoles.console_view_entry(
+        category = "builder|weblayer",
+        short_name = "x86",
     ),
 )
 
 ci.android_fyi_builder(
     name = "Android WebView P FYI (rel)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "webview",
         short_name = "p-rel",
     ),
@@ -906,7 +1031,7 @@ ci.android_fyi_builder(
 # TODO(hypan): remove this once there is no associated disabled tests
 ci.android_fyi_builder(
     name = "android-pie-x86-fyi-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "emulator|P|x86",
         short_name = "rel",
     ),
@@ -914,10 +1039,18 @@ ci.android_fyi_builder(
     schedule = "triggered",  # triggered manually via Scheduler UI
 )
 
+ci.android_fyi_builder(
+    name = "android-11-x86-fyi-rel",
+    console_view_entry = consoles.console_view_entry(
+        category = "emulator|11|x86",
+        short_name = "rel",
+    ),
+)
+
 ci.chromium_builder(
     name = "android-archive-dbg",
     # Bump to 32 if needed.
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "android",
         short_name = "dbg",
     ),
@@ -927,7 +1060,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "android-archive-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "android",
         short_name = "rel",
     ),
@@ -937,9 +1070,9 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "android-official",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_console_view = settings.main_console_name,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_console_view = "main",
+    console_view_entry = consoles.console_view_entry(
         category = "android",
         short_name = "off",
     ),
@@ -949,9 +1082,9 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "fuchsia-official",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_console_view = settings.main_console_name,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_console_view = "main",
+    console_view_entry = consoles.console_view_entry(
         category = "fuchsia",
         short_name = "off",
     ),
@@ -964,7 +1097,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "linux-archive-dbg",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux",
         short_name = "dbg",
     ),
@@ -975,7 +1108,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "linux-archive-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux",
         short_name = "rel",
     ),
@@ -986,12 +1119,12 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "linux-official",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     builderless = False,
     # TODO(https://crbug.com/1072012) Use the default console view and add
-    # main_console_view = settings.main_console_name once the build is green
-    console_view = "chromium.fyi",
-    console_view_entry = ci.console_view_entry(
+    # main_console_view = 'main' once the build is green
+    console_view_entry = consoles.console_view_entry(
+        console_view = "chromium.fyi",
         category = "linux",
         short_name = "off",
     ),
@@ -1005,7 +1138,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "mac-archive-dbg",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "mac",
         short_name = "dbg",
     ),
@@ -1017,7 +1150,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "mac-archive-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "mac",
         short_name = "rel",
     ),
@@ -1029,9 +1162,9 @@ ci.chromium_builder(
     name = "mac-official",
     builderless = False,
     # TODO(https://crbug.com/1072012) Use the default console view and add
-    # main_console_view = settings.main_console_name once the build is green
-    console_view = "chromium.fyi",
-    console_view_entry = ci.console_view_entry(
+    # main_console_view = 'main' once the build is green
+    console_view_entry = consoles.console_view_entry(
+        console_view = "chromium.fyi",
         category = "mac",
         short_name = "off",
     ),
@@ -1046,7 +1179,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "win-archive-dbg",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "win|dbg",
         short_name = "64",
     ),
@@ -1058,7 +1191,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "win-archive-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "win|rel",
         short_name = "64",
     ),
@@ -1069,9 +1202,9 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "win-official",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_console_view = settings.main_console_name,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_console_view = "main",
+    console_view_entry = consoles.console_view_entry(
         category = "win|off",
         short_name = "64",
     ),
@@ -1083,7 +1216,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "win32-archive-dbg",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "win|dbg",
         short_name = "32",
     ),
@@ -1095,7 +1228,7 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "win32-archive-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "win|rel",
         short_name = "32",
     ),
@@ -1106,9 +1239,9 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = "win32-official",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_console_view = settings.main_console_name,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_console_view = "main",
+    console_view_entry = consoles.console_view_entry(
         category = "win|off",
         short_name = "32",
     ),
@@ -1120,7 +1253,7 @@ ci.chromium_builder(
 
 ci.chromiumos_builder(
     name = "Linux ChromiumOS Full",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "default",
         short_name = "ful",
     ),
@@ -1129,7 +1262,7 @@ ci.chromiumos_builder(
 
 ci.chromiumos_builder(
     name = "chromeos-amd64-generic-asan-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "simple|release|x64",
         short_name = "asn",
     ),
@@ -1138,7 +1271,7 @@ ci.chromiumos_builder(
 
 ci.chromiumos_builder(
     name = "chromeos-amd64-generic-cfi-thin-lto-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "simple|release|x64",
         short_name = "cfi",
     ),
@@ -1147,40 +1280,40 @@ ci.chromiumos_builder(
 
 ci.chromiumos_builder(
     name = "chromeos-amd64-generic-dbg",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "simple|debug|x64",
         short_name = "dbg",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
 )
 
 ci.chromiumos_builder(
     name = "chromeos-amd64-generic-lacros-dbg",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "lacros|x64",
         short_name = "dbg",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
 )
 
 ci.chromiumos_builder(
     name = "chromeos-amd64-generic-rel",
-    branch_selector = branches.ALL_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.ALL_BRANCHES,
+    console_view_entry = consoles.console_view_entry(
         category = "simple|release|x64",
         short_name = "rel",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
 )
 
 ci.chromiumos_builder(
     name = "chromeos-arm-generic-dbg",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "simple|debug",
         short_name = "arm",
     ),
@@ -1189,19 +1322,19 @@ ci.chromiumos_builder(
 
 ci.chromiumos_builder(
     name = "chromeos-arm-generic-rel",
-    branch_selector = branches.ALL_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.ALL_BRANCHES,
+    console_view_entry = consoles.console_view_entry(
         category = "simple|release",
         short_name = "arm",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
 )
 
 ci.chromiumos_builder(
     name = "chromeos-kevin-rel",
-    branch_selector = branches.ALL_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.ALL_BRANCHES,
+    console_view_entry = consoles.console_view_entry(
         category = "simple|release",
         short_name = "kvn",
     ),
@@ -1210,30 +1343,54 @@ ci.chromiumos_builder(
 
 ci.chromiumos_builder(
     name = "linux-chromeos-dbg",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "default",
         short_name = "dbg",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
 )
 
 ci.chromiumos_builder(
     name = "linux-chromeos-rel",
-    branch_selector = branches.ALL_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.ALL_BRANCHES,
+    console_view_entry = consoles.console_view_entry(
         category = "default",
         short_name = "rel",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
+)
+
+ci.chromiumos_builder(
+    name = "linux-lacros-builder-rel",
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
+        category = "default",
+        short_name = "lcr",
+    ),
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
+)
+
+ci.chromiumos_builder(
+    name = "linux-lacros-tester-rel",
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
+        category = "default",
+        short_name = "lcr",
+    ),
+    main_console_view = "main",
+    cq_mirrors_console_view = "mirrors",
+    triggered_by = ["linux-lacros-builder-rel"],
+    tree_closing = False,
 )
 
 ci.clang_builder(
     name = "CFI Linux CF",
     goma_backend = goma.backend.RBE_PROD,
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "CFI|Linux",
         short_name = "CF",
     ),
@@ -1242,7 +1399,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "CFI Linux ToT",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "CFI|Linux",
         short_name = "ToT",
     ),
@@ -1251,7 +1408,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "CrWinAsan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Windows|Asan",
         short_name = "asn",
     ),
@@ -1260,7 +1417,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "CrWinAsan(dll)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Windows|Asan",
         short_name = "dll",
     ),
@@ -1269,7 +1426,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTAndroid",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Android",
         short_name = "rel",
     ),
@@ -1277,7 +1434,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTAndroid (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Android",
         short_name = "dbg",
     ),
@@ -1285,7 +1442,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTAndroid x64",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Android",
         short_name = "x64",
     ),
@@ -1293,7 +1450,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTAndroid64",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Android",
         short_name = "a64",
     ),
@@ -1301,7 +1458,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTAndroidASan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Android",
         short_name = "asn",
     ),
@@ -1309,7 +1466,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTAndroidCFI",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Android",
         short_name = "cfi",
     ),
@@ -1317,7 +1474,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTAndroidOfficial",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Android",
         short_name = "off",
     ),
@@ -1325,7 +1482,7 @@ ci.clang_builder(
 
 def clang_tot_linux_builder(short_name, category = "ToT Linux", **kwargs):
     ci.clang_builder(
-        console_view_entry = ci.console_view_entry(
+        console_view_entry = consoles.console_view_entry(
             category = category,
             short_name = short_name,
         ),
@@ -1388,7 +1545,7 @@ clang_tot_linux_builder(
 
 ci.clang_builder(
     name = "ToTWin(dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Windows",
         short_name = "dbg",
     ),
@@ -1397,7 +1554,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTWin(dll)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Windows",
         short_name = "dll",
     ),
@@ -1406,7 +1563,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTWin64(dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Windows|x64",
         short_name = "dbg",
     ),
@@ -1415,7 +1572,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTWin64(dll)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Windows|x64",
         short_name = "dll",
     ),
@@ -1424,7 +1581,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTWinASanLibfuzzer",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Windows|Asan",
         short_name = "fuz",
     ),
@@ -1433,7 +1590,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTWinCFI",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "CFI|Win",
         short_name = "x86",
     ),
@@ -1442,7 +1599,7 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "ToTWinCFI64",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "CFI|Win",
         short_name = "x64",
     ),
@@ -1451,15 +1608,25 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = "UBSanVptr Linux",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         short_name = "usn",
     ),
     goma_backend = goma.backend.RBE_PROD,
 )
 
 ci.clang_builder(
+    name = "ToTWindowsCoverage",
+    console_view_entry = consoles.console_view_entry(
+        category = "ToT Code Coverage",
+        short_name = "win",
+    ),
+    executable = "recipe:chromium_clang_coverage_tot",
+    os = os.WINDOWS_ANY,
+)
+
+ci.clang_builder(
     name = "linux-win_cross-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Windows",
         short_name = "lxw",
     ),
@@ -1468,38 +1635,32 @@ ci.clang_builder(
 ci.clang_builder(
     name = "ToTiOS",
     builderless = False,
-    caches = [xcode_cache.x12a7209],
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "iOS|public",
         short_name = "sim",
     ),
     cores = None,
     os = os.MAC_10_15,
-    properties = {
-        "xcode_build_version": "12a7209",
-    },
     ssd = True,
+    xcode = xcode.x12a7209,
 )
 
 ci.clang_builder(
     name = "ToTiOSDevice",
     builderless = False,
-    caches = [xcode_cache.x12a7209],
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "iOS|public",
         short_name = "dev",
     ),
     cores = None,
     os = os.MAC_10_15,
-    properties = {
-        "xcode_build_version": "12a7209",
-    },
     ssd = True,
+    xcode = xcode.x12a7209,
 )
 
 ci.clang_mac_builder(
     name = "ToTMac",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Mac",
         short_name = "rel",
     ),
@@ -1507,7 +1668,7 @@ ci.clang_mac_builder(
 
 ci.clang_mac_builder(
     name = "ToTMac (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Mac",
         short_name = "dbg",
     ),
@@ -1515,7 +1676,7 @@ ci.clang_mac_builder(
 
 ci.clang_mac_builder(
     name = "ToTMacASan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Mac",
         short_name = "asn",
     ),
@@ -1523,7 +1684,7 @@ ci.clang_mac_builder(
 
 ci.clang_mac_builder(
     name = "ToTMacCoverage",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT Code Coverage",
         short_name = "mac",
     ),
@@ -1532,7 +1693,7 @@ ci.clang_mac_builder(
 
 ci.dawn_linux_builder(
     name = "Dawn Linux x64 Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT|Linux|Builder",
         short_name = "x64",
     ),
@@ -1540,42 +1701,42 @@ ci.dawn_linux_builder(
 
 ci.dawn_linux_builder(
     name = "Dawn Linux x64 DEPS Builder",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Linux|Builder",
         short_name = "x64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
 )
 
 ci.dawn_thin_tester(
     name = "Dawn Linux x64 DEPS Release (Intel HD 630)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Linux|Intel",
         short_name = "x64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Dawn Linux x64 DEPS Builder")],
 )
 
 ci.dawn_thin_tester(
     name = "Dawn Linux x64 DEPS Release (NVIDIA)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Linux|Nvidia",
         short_name = "x64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Dawn Linux x64 DEPS Builder")],
 )
 
 ci.dawn_thin_tester(
     name = "Dawn Linux x64 Release (Intel HD 630)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT|Linux|Intel",
         short_name = "x64",
     ),
@@ -1584,7 +1745,7 @@ ci.dawn_thin_tester(
 
 ci.dawn_thin_tester(
     name = "Dawn Linux x64 Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT|Linux|Nvidia",
         short_name = "x64",
     ),
@@ -1593,7 +1754,7 @@ ci.dawn_thin_tester(
 
 ci.dawn_mac_builder(
     name = "Dawn Mac x64 Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT|Mac|Builder",
         short_name = "x64",
     ),
@@ -1601,12 +1762,12 @@ ci.dawn_mac_builder(
 
 ci.dawn_mac_builder(
     name = "Dawn Mac x64 DEPS Builder",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Mac|Builder",
         short_name = "x64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
 )
 
@@ -1614,31 +1775,31 @@ ci.dawn_mac_builder(
 # physical Mac hardware in the Swarming pool which is why they run on linux
 ci.dawn_thin_tester(
     name = "Dawn Mac x64 DEPS Release (AMD)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Mac|AMD",
         short_name = "x64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Dawn Mac x64 DEPS Builder")],
 )
 
 ci.dawn_thin_tester(
     name = "Dawn Mac x64 DEPS Release (Intel)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Mac|Intel",
         short_name = "x64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Dawn Mac x64 DEPS Builder")],
 )
 
 ci.dawn_thin_tester(
     name = "Dawn Mac x64 Release (AMD)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT|Mac|AMD",
         short_name = "x64",
     ),
@@ -1647,7 +1808,7 @@ ci.dawn_thin_tester(
 
 ci.dawn_thin_tester(
     name = "Dawn Mac x64 Release (Intel)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT|Mac|Intel",
         short_name = "x64",
     ),
@@ -1656,7 +1817,7 @@ ci.dawn_thin_tester(
 
 ci.dawn_windows_builder(
     name = "Dawn Win10 x64 ASAN Release",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT|Windows|ASAN",
         short_name = "x64",
     ),
@@ -1664,7 +1825,7 @@ ci.dawn_windows_builder(
 
 ci.dawn_windows_builder(
     name = "Dawn Win10 x64 Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT|Windows|Builder",
         short_name = "x64",
     ),
@@ -1672,12 +1833,12 @@ ci.dawn_windows_builder(
 
 ci.dawn_windows_builder(
     name = "Dawn Win10 x64 DEPS Builder",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Windows|Builder",
         short_name = "x64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
 )
 
@@ -1685,31 +1846,31 @@ ci.dawn_windows_builder(
 # physical Win hardware in the Swarming pool, which is why they run on linux
 ci.dawn_thin_tester(
     name = "Dawn Win10 x64 DEPS Release (Intel HD 630)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Windows|Intel",
         short_name = "x64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Dawn Win10 x64 DEPS Builder")],
 )
 
 ci.dawn_thin_tester(
     name = "Dawn Win10 x64 DEPS Release (NVIDIA)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Windows|Nvidia",
         short_name = "x64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Dawn Win10 x64 DEPS Builder")],
 )
 
 ci.dawn_thin_tester(
     name = "Dawn Win10 x64 Release (Intel HD 630)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT|Windows|Intel",
         short_name = "x64",
     ),
@@ -1718,7 +1879,7 @@ ci.dawn_thin_tester(
 
 ci.dawn_thin_tester(
     name = "Dawn Win10 x64 Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT|Windows|Nvidia",
         short_name = "x64",
     ),
@@ -1727,7 +1888,7 @@ ci.dawn_thin_tester(
 
 ci.dawn_windows_builder(
     name = "Dawn Win10 x86 Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT|Windows|Builder",
         short_name = "x86",
     ),
@@ -1735,12 +1896,12 @@ ci.dawn_windows_builder(
 
 ci.dawn_windows_builder(
     name = "Dawn Win10 x86 DEPS Builder",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Windows|Builder",
         short_name = "x86",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
 )
 
@@ -1748,31 +1909,31 @@ ci.dawn_windows_builder(
 # physical Win hardware in the Swarming pool, which is why they run on linux
 ci.dawn_thin_tester(
     name = "Dawn Win10 x86 DEPS Release (Intel HD 630)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Windows|Intel",
         short_name = "x86",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Dawn Win10 x86 DEPS Builder")],
 )
 
 ci.dawn_thin_tester(
     name = "Dawn Win10 x86 DEPS Release (NVIDIA)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Windows|Nvidia",
         short_name = "x86",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("Dawn Win10 x86 DEPS Builder")],
 )
 
 ci.dawn_thin_tester(
     name = "Dawn Win10 x86 Release (Intel HD 630)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT|Windows|Intel",
         short_name = "x86",
     ),
@@ -1781,7 +1942,7 @@ ci.dawn_thin_tester(
 
 ci.dawn_thin_tester(
     name = "Dawn Win10 x86 Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT|Windows|Nvidia",
         short_name = "x86",
     ),
@@ -1790,7 +1951,7 @@ ci.dawn_thin_tester(
 
 ci.fuzz_builder(
     name = "ASAN Debug",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux asan",
         short_name = "dbg",
     ),
@@ -1801,7 +1962,7 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = "ASan Debug (32-bit x86 with V8-ARM)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux asan|x64 v8-ARM",
         short_name = "dbg",
     ),
@@ -1812,7 +1973,7 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = "ASAN Release",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux asan",
         short_name = "rel",
     ),
@@ -1823,7 +1984,7 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = "ASan Release (32-bit x86 with V8-ARM)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux asan|x64 v8-ARM",
         short_name = "rel",
     ),
@@ -1834,7 +1995,7 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = "ASAN Release Media",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux asan",
         short_name = "med",
     ),
@@ -1845,7 +2006,7 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = "Afl Upload Linux ASan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "afl",
         short_name = "afl",
     ),
@@ -1857,7 +2018,7 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = "ASan Release Media (32-bit x86 with V8-ARM)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux asan|x64 v8-ARM",
         short_name = "med",
     ),
@@ -1868,7 +2029,7 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = "ChromiumOS ASAN Release",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "cros asan",
     ),
     triggering_policy = scheduler.greedy_batching(
@@ -1878,7 +2039,7 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = "MSAN Release (chained origins)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux msan",
         short_name = "org",
     ),
@@ -1889,7 +2050,7 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = "MSAN Release (no origins)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux msan",
         short_name = "rel",
     ),
@@ -1901,7 +2062,7 @@ ci.fuzz_builder(
 ci.fuzz_builder(
     name = "Mac ASAN Release",
     builderless = False,
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "mac asan",
         short_name = "rel",
     ),
@@ -1915,7 +2076,7 @@ ci.fuzz_builder(
 ci.fuzz_builder(
     name = "Mac ASAN Release Media",
     builderless = False,
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "mac asan",
         short_name = "med",
     ),
@@ -1928,7 +2089,7 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = "TSAN Debug",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux tsan",
         short_name = "dbg",
     ),
@@ -1939,7 +2100,7 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = "TSAN Release",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux tsan",
         short_name = "rel",
     ),
@@ -1950,7 +2111,7 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = "UBSan Release",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux UBSan",
         short_name = "rel",
     ),
@@ -1961,7 +2122,7 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = "UBSan vptr Release",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux UBSan",
         short_name = "vpt",
     ),
@@ -1973,7 +2134,7 @@ ci.fuzz_builder(
 ci.fuzz_builder(
     name = "Win ASan Release",
     builderless = False,
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "win asan",
         short_name = "rel",
     ),
@@ -1986,7 +2147,7 @@ ci.fuzz_builder(
 ci.fuzz_builder(
     name = "Win ASan Release Media",
     builderless = False,
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "win asan",
         short_name = "med",
     ),
@@ -1998,7 +2159,7 @@ ci.fuzz_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = "Libfuzzer Upload Chrome OS ASan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "libfuzz",
         short_name = "chromeos-asan",
     ),
@@ -2009,7 +2170,7 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = "Libfuzzer Upload Linux ASan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "libfuzz",
         short_name = "linux",
     ),
@@ -2020,7 +2181,7 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = "Libfuzzer Upload Linux ASan Debug",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "libfuzz",
         short_name = "linux-dbg",
     ),
@@ -2031,7 +2192,7 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = "Libfuzzer Upload Linux MSan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "libfuzz",
         short_name = "linux-msan",
     ),
@@ -2044,11 +2205,11 @@ ci.fuzz_libfuzzer_builder(
     name = "Libfuzzer Upload Linux UBSan",
     # Do not use builderless for this (crbug.com/980080).
     builderless = False,
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "libfuzz",
         short_name = "linux-ubsan",
     ),
-    execution_timeout = 3 * time.hour + 30 * time.minute,
+    execution_timeout = 4 * time.hour,
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 5,
     ),
@@ -2056,7 +2217,7 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = "Libfuzzer Upload Linux V8-ARM64 ASan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "libfuzz",
         short_name = "arm64",
     ),
@@ -2067,7 +2228,7 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = "Libfuzzer Upload Linux V8-ARM64 ASan Debug",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "libfuzz",
         short_name = "arm64-dbg",
     ),
@@ -2078,7 +2239,7 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = "Libfuzzer Upload Linux32 ASan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "libfuzz",
         short_name = "linux32",
     ),
@@ -2089,7 +2250,7 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = "Libfuzzer Upload Linux32 ASan Debug",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "libfuzz",
         short_name = "linux32-dbg",
     ),
@@ -2100,7 +2261,7 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = "Libfuzzer Upload Linux32 V8-ARM ASan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "libfuzz",
         short_name = "arm",
     ),
@@ -2111,7 +2272,7 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = "Libfuzzer Upload Linux32 V8-ARM ASan Debug",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "libfuzz",
         short_name = "arm-dbg",
     ),
@@ -2122,7 +2283,7 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = "Libfuzzer Upload Mac ASan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "libfuzz",
         short_name = "mac-asan",
     ),
@@ -2133,7 +2294,7 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = "Libfuzzer Upload Windows ASan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "libfuzz",
         short_name = "win-asan",
     ),
@@ -2144,31 +2305,22 @@ ci.fuzz_libfuzzer_builder(
 )
 
 ci.fyi_builder(
-    name = "Closure Compilation Linux",
-    console_view_entry = ci.console_view_entry(
-        category = "closure_compilation",
-    ),
-    executable = "recipe:closure_compilation",
-    notifies = ["Closure Compilation Linux"],
-)
-
-ci.fyi_builder(
     name = "Linux Viz",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "viz",
     ),
 )
 
 ci.fyi_builder(
     name = "Linux remote_run Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "remote_run",
     ),
 )
 
 ci.fyi_builder(
     name = "Linux remote_run Tester",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "remote_run",
     ),
     triggered_by = ["Linux remote_run Builder"],
@@ -2176,7 +2328,7 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "Site Isolation Android",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "site_isolation",
     ),
     notifies = ["Site Isolation Android"],
@@ -2184,17 +2336,57 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "VR Linux",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "linux",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
 )
 
 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",
+    builderless = True,
+    console_view_entry = consoles.console_view_entry(
+        category = "paeverywhere|android",
+        short_name = "32rel",
+    ),
+    notifies = ["chrome-memory-safety"],
+)
+
+ci.fyi_builder(
+    name = "android-paeverywhere-arm64-fyi-dbg",
+    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",
+        short_name = "64rel",
+    ),
+    notifies = ["chrome-memory-safety"],
+)
+
+ci.fyi_builder(
     name = "chromeos-amd64-generic-lacros-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "chromeos",
     ),
     properties = {
@@ -2228,7 +2420,7 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "fuchsia-fyi-arm64-dbg",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "fuchsia|a64",
         short_name = "dbg",
     ),
@@ -2237,7 +2429,7 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "fuchsia-fyi-arm64-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "fuchsia|a64",
         short_name = "rel",
     ),
@@ -2246,7 +2438,7 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "fuchsia-fyi-x64-dbg",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "fuchsia|x64",
         short_name = "dbg",
     ),
@@ -2255,7 +2447,7 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "fuchsia-fyi-x64-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "fuchsia|x64",
         short_name = "rel",
     ),
@@ -2264,7 +2456,7 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "linux-annotator-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "network|traffic|annotations",
         short_name = "lnx",
     ),
@@ -2273,7 +2465,7 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "linux-ash-chromium-builder-fyi-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "default",
         short_name = "lcr",
     ),
@@ -2311,7 +2503,7 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "linux-blink-animation-use-time-delta",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux|blink",
         short_name = "TD",
     ),
@@ -2319,7 +2511,7 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "linux-blink-heap-concurrent-marking-tsan-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux|blink",
         short_name = "CM",
     ),
@@ -2327,56 +2519,16 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "linux-blink-heap-verification",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux|blink",
         short_name = "VF",
     ),
     notifies = ["linux-blink-heap-verification"],
 )
 
-# For testing impact of builderful: https://crbug.com/1123673
-# remove by 2020-10-05 gatong
-ci.fyi_builder(
-    name = "linux-builderful-fast-fyi-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "build test",
-        short_name = "bff",
-    ),
-    builderless = False,
-)
-
-ci.fyi_builder(
-    name = "linux-builderful-slow-fyi-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "build test",
-        short_name = "bfs",
-    ),
-    builderless = False,
-    schedule = "with 2h interval",
-    triggered_by = [],
-)
-
-ci.fyi_builder(
-    name = "linux-builderless-fast-fyi-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "build test",
-        short_name = "blf",
-    ),
-)
-
-ci.fyi_builder(
-    name = "linux-builderless-slow-fyi-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "build test",
-        short_name = "bls",
-    ),
-    schedule = "with 2h interval",
-    triggered_by = [],
-)
-
 ci.fyi_builder(
     name = "linux-chromium-tests-staging-builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "recipe|staging|linux",
         short_name = "bld",
     ),
@@ -2384,7 +2536,7 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "linux-chromium-tests-staging-tests",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "recipe|staging|linux",
         short_name = "tst",
     ),
@@ -2393,28 +2545,28 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "linux-inverse-fieldtrials-fyi-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux",
     ),
 )
 
 ci.fyi_builder(
     name = "linux-fieldtrial-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux",
     ),
 )
 
 ci.fyi_builder(
     name = "linux-lacros-builder-fyi-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux",
     ),
 )
 
 ci.fyi_builder(
     name = "linux-lacros-tester-fyi-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux",
     ),
     triggered_by = ["linux-lacros-builder-fyi-rel"],
@@ -2422,14 +2574,14 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "linux-perfetto-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux",
     ),
 )
 
 ci.fyi_builder(
     name = "linux-wpt-fyi-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux",
     ),
     experimental = True,
@@ -2438,7 +2590,7 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "linux-wpt-identity-fyi-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux",
     ),
     experimental = True,
@@ -2447,7 +2599,7 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "linux-wpt-payments-fyi-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux",
     ),
     experimental = True,
@@ -2458,7 +2610,7 @@ ci.fyi_builder(
 # OS shouldn't matter.
 ci.fyi_builder(
     name = "mac-osxbeta-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "mac",
         short_name = "beta",
     ),
@@ -2467,9 +2619,9 @@ ci.fyi_builder(
     triggered_by = ["ci/Mac Builder"],
 )
 
-ci.fyi_builder(
-    name = "mac-omaha-builder-rel",
-    console_view_entry = ci.console_view_entry(
+ci.updater_builder(
+    name = "mac-updater-builder-rel",
+    console_view_entry = consoles.console_view_entry(
         category = "updater|mac",
         short_name = "bld",
     ),
@@ -2479,63 +2631,54 @@ ci.fyi_builder(
     cores = None,
 )
 
-ci.fyi_builder(
-    name = "mac10.10-omaha-tester-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "updater|mac",
-        short_name = "10.10",
-    ),
-    triggered_by = ["mac-omaha-builder-rel"],
-)
-
-ci.fyi_builder(
-    name = "mac10.11-omaha-tester-rel",
-    console_view_entry = ci.console_view_entry(
+ci.updater_builder(
+    name = "mac10.11-updater-tester-rel",
+    console_view_entry = consoles.console_view_entry(
         category = "updater|mac",
         short_name = "10.11",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "mac10.12-omaha-tester-rel",
-    console_view_entry = ci.console_view_entry(
+ci.updater_builder(
+    name = "mac10.12-updater-tester-rel",
+    console_view_entry = consoles.console_view_entry(
         category = "updater|mac",
         short_name = "10.12",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "mac10.13-omaha-tester-rel",
-    console_view_entry = ci.console_view_entry(
+ci.updater_builder(
+    name = "mac10.13-updater-tester-rel",
+    console_view_entry = consoles.console_view_entry(
         category = "updater|mac",
         short_name = "10.13",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "mac10.14-omaha-tester-rel",
-    console_view_entry = ci.console_view_entry(
+ci.updater_builder(
+    name = "mac10.14-updater-tester-rel",
+    console_view_entry = consoles.console_view_entry(
         category = "updater|mac",
         short_name = "10.14",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "mac10.15-omaha-tester-rel",
-    console_view_entry = ci.console_view_entry(
+ci.updater_builder(
+    name = "mac10.15-updater-tester-rel",
+    console_view_entry = consoles.console_view_entry(
         category = "updater|mac",
         short_name = "10.15",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "win-omaha-builder-rel",
-    console_view_entry = ci.console_view_entry(
+ci.updater_builder(
+    name = "win-updater-builder-rel",
+    console_view_entry = consoles.console_view_entry(
         category = "updater|win",
         short_name = "bld",
     ),
@@ -2543,28 +2686,72 @@ ci.fyi_builder(
     cpu = cpu.X86,
 )
 
-ci.fyi_builder(
-    name = "win7-omaha-tester-rel",
-    console_view_entry = ci.console_view_entry(
+ci.updater_builder(
+    name = "win7-updater-tester-rel",
+    console_view_entry = consoles.console_view_entry(
         category = "updater|win",
         short_name = "7",
     ),
-    triggered_by = ["win-omaha-builder-rel"],
+    triggered_by = ["win-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "win10-omaha-tester-rel",
-    console_view_entry = ci.console_view_entry(
+ci.updater_builder(
+    name = "win10-updater-tester-rel",
+    console_view_entry = consoles.console_view_entry(
         category = "updater|win",
         short_name = "10",
     ),
     os = os.WINDOWS_10,
-    triggered_by = ["win-omaha-builder-rel"],
+    triggered_by = ["win-updater-builder-rel"],
+)
+
+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",
+    builderless = True,
+    console_view_entry = consoles.console_view_entry(
+        category = "paeverywhere|win",
+        short_name = "32rel",
+    ),
+    notifies = ["chrome-memory-safety"],
+    os = os.WINDOWS_ANY,
+)
+
+ci.fyi_builder(
+    name = "win-paeverywhere-x64-fyi-dbg",
+    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",
+        short_name = "64rel",
+    ),
+    notifies = ["chrome-memory-safety"],
+    os = os.WINDOWS_ANY,
 )
 
 ci.fyi_builder(
     name = "win-pixel-builder-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "win10",
     ),
     os = os.WINDOWS_10,
@@ -2572,7 +2759,7 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "win-pixel-tester-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "win10",
     ),
     os = None,
@@ -2581,7 +2768,7 @@ ci.fyi_builder(
 
 ci.fyi_builder(
     name = "linux-upload-perfetto",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "perfetto",
         short_name = "lnx",
     ),
@@ -2591,7 +2778,7 @@ ci.fyi_builder(
 ci.fyi_builder(
     name = "mac-upload-perfetto",
     builderless = True,
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "perfetto",
         short_name = "mac",
     ),
@@ -2603,7 +2790,7 @@ ci.fyi_builder(
 ci.fyi_builder(
     name = "win-upload-perfetto",
     builderless = True,
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "perfetto",
         short_name = "win",
     ),
@@ -2614,7 +2801,7 @@ ci.fyi_builder(
 
 ci.fyi_celab_builder(
     name = "win-celab-builder-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "celab",
     ),
     schedule = "0 0,6,12,18 * * *",
@@ -2623,7 +2810,7 @@ ci.fyi_celab_builder(
 
 ci.fyi_celab_builder(
     name = "win-celab-tester-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "celab",
     ),
     triggered_by = ["win-celab-builder-rel"],
@@ -2631,7 +2818,7 @@ ci.fyi_celab_builder(
 
 ci.fyi_coverage_builder(
     name = "android-code-coverage",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "code_coverage",
         short_name = "and",
     ),
@@ -2642,7 +2829,7 @@ ci.fyi_coverage_builder(
 
 ci.fyi_coverage_builder(
     name = "android-code-coverage-native",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "code_coverage",
         short_name = "ann",
     ),
@@ -2651,8 +2838,7 @@ ci.fyi_coverage_builder(
 
 ci.fyi_coverage_builder(
     name = "ios-simulator-code-coverage",
-    caches = [xcode_cache.x12a7209],
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "code_coverage",
         short_name = "ios",
     ),
@@ -2661,14 +2847,12 @@ ci.fyi_coverage_builder(
     use_clang_coverage = True,
     coverage_exclude_sources = "ios_test_files_and_test_utils",
     coverage_test_types = ["overall", "unit"],
-    properties = {
-        "xcode_build_version": "12a7209",
-    },
+    xcode = xcode.x12a7209,
 )
 
 ci.fyi_coverage_builder(
     name = "linux-chromeos-code-coverage",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "code_coverage",
         short_name = "lcr",
     ),
@@ -2678,8 +2862,19 @@ ci.fyi_coverage_builder(
 )
 
 ci.fyi_coverage_builder(
+    name = "linux-chromeos-js-code-coverage",
+    console_view_entry = consoles.console_view_entry(
+        category = "code_coverage",
+        short_name = "jcr",
+    ),
+    use_javascript_coverage = True,
+    schedule = "triggered",
+    triggered_by = [],
+)
+
+ci.fyi_coverage_builder(
     name = "linux-code-coverage",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "code_coverage",
         short_name = "lnx",
     ),
@@ -2690,7 +2885,7 @@ ci.fyi_coverage_builder(
 ci.fyi_coverage_builder(
     name = "mac-code-coverage",
     builderless = True,
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "code_coverage",
         short_name = "mac",
     ),
@@ -2702,7 +2897,7 @@ ci.fyi_coverage_builder(
 ci.fyi_coverage_builder(
     name = "win10-code-coverage",
     builderless = True,
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "code_coverage",
         short_name = "win",
     ),
@@ -2712,7 +2907,7 @@ ci.fyi_coverage_builder(
 
 ci.fyi_ios_builder(
     name = "ios-asan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "iOS",
         short_name = "asan",
     ),
@@ -2720,7 +2915,7 @@ ci.fyi_ios_builder(
 
 ci.fyi_ios_builder(
     name = "ios-simulator-cr-recipe",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "iOS",
         short_name = "chr",
     ),
@@ -2728,22 +2923,19 @@ ci.fyi_ios_builder(
 
 ci.fyi_ios_builder(
     name = "ios-simulator-cronet",
-    branch_selector = branches.STANDARD_RELEASES,
-    caches = [xcode_cache.x11e146],
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "cronet",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     notifies = ["cronet"],
-    properties = {
-        "xcode_build_version": "11e146",
-    },
+    xcode = xcode.x11e146,
 )
 
 ci.fyi_ios_builder(
     name = "ios-simulator-multi-window",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "iOS",
         short_name = "mwd",
     ),
@@ -2751,21 +2943,18 @@ ci.fyi_ios_builder(
 
 ci.fyi_ios_builder(
     name = "ios-webkit-tot",
-    caches = [xcode_cache.x11e608cwk],
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "iOS",
         short_name = "wk",
     ),
-    properties = {
-        "xcode_build_version": "11e608cwk",
-    },
     schedule = "0 1-23/6 * * *",
     triggered_by = [],
+    xcode = xcode.x11e608cwk,
 )
 
 ci.fyi_ios_builder(
     name = "ios13-beta-simulator",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "iOS|iOS13",
         short_name = "ios13",
     ),
@@ -2775,7 +2964,7 @@ ci.fyi_ios_builder(
 
 ci.fyi_ios_builder(
     name = "ios13-sdk-device",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "iOS|iOS13",
         short_name = "dev",
     ),
@@ -2783,7 +2972,7 @@ ci.fyi_ios_builder(
 
 ci.fyi_ios_builder(
     name = "ios13-sdk-simulator",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "iOS|iOS13",
         short_name = "sdk13",
     ),
@@ -2793,7 +2982,7 @@ ci.fyi_ios_builder(
 
 ci.fyi_ios_builder(
     name = "ios14-beta-simulator",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "iOS|iOS14",
         short_name = "ios14",
     ),
@@ -2801,19 +2990,16 @@ ci.fyi_ios_builder(
 
 ci.fyi_ios_builder(
     name = "ios14-sdk-simulator",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "iOS|iOS14",
         short_name = "sdk14",
     ),
-    caches = [xcode_cache.x12b5018i],
-    properties = {
-        "xcode_build_version": "12b5018i",
-    },
+    xcode = xcode.x12b5035g,
 )
 
 ci.fyi_mac_builder(
     name = "Mac Builder Next",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "mac",
         short_name = "bld",
     ),
@@ -2824,7 +3010,7 @@ ci.fyi_mac_builder(
 ci.thin_tester(
     name = "Mac11.0 Tests",
     builder_group = "chromium.fyi",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "mac",
         short_name = "11.0",
     ),
@@ -2833,7 +3019,7 @@ ci.thin_tester(
 
 ci.fyi_mac_builder(
     name = "Mac deterministic",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "deterministic|mac",
         short_name = "rel",
     ),
@@ -2844,7 +3030,7 @@ ci.fyi_mac_builder(
 
 ci.fyi_mac_builder(
     name = "Mac deterministic (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "deterministic|mac",
         short_name = "dbg",
     ),
@@ -2856,7 +3042,7 @@ ci.fyi_mac_builder(
 
 ci.fyi_mac_builder(
     name = "mac-hermetic-upgrade-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "mac",
         short_name = "herm",
     ),
@@ -2865,7 +3051,7 @@ ci.fyi_mac_builder(
 
 ci.fyi_windows_builder(
     name = "Win10 Tests x64 1803",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "win10|1803",
     ),
     goma_backend = None,
@@ -2876,7 +3062,7 @@ ci.fyi_windows_builder(
 
 ci.fyi_windows_builder(
     name = "Win10 Tests x64 1909",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "win10|1909",
     ),
     goma_backend = None,
@@ -2887,7 +3073,7 @@ ci.fyi_windows_builder(
 
 ci.fyi_windows_builder(
     name = "Win 10 Fast Ring",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "win10",
     ),
     os = os.WINDOWS_10,
@@ -2896,7 +3082,7 @@ ci.fyi_windows_builder(
 
 ci.fyi_windows_builder(
     name = "win32-arm64-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "win32|arm64",
     ),
     cpu = cpu.X86,
@@ -2906,7 +3092,7 @@ ci.fyi_windows_builder(
 ci.fyi_windows_builder(
     name = "win-annotator-rel",
     builderless = True,
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "network|traffic|annotations",
         short_name = "win",
     ),
@@ -2914,29 +3100,39 @@ ci.fyi_windows_builder(
     notifies = ["annotator-rel"],
 )
 
+ci.fyi_windows_builder(
+    name = "win10-inverse-fieldtrials-fyi-rel",
+    builderless = True,
+    console_view_entry = consoles.console_view_entry(
+        category = "win10",
+        short_name = "IFT",
+    ),
+    os = os.WINDOWS_10,
+)
+
 ci.gpu_linux_builder(
     name = "Android Release (Nexus 5X)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "Android",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
 )
 
 ci.gpu_linux_builder(
     name = "GPU Linux Builder",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "Linux",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
 )
 
 ci.gpu_linux_builder(
     name = "GPU Linux Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux",
     ),
     tree_closing = False,
@@ -2944,17 +3140,17 @@ ci.gpu_linux_builder(
 
 ci.gpu_mac_builder(
     name = "GPU Mac Builder",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "Mac",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
 )
 
 ci.gpu_mac_builder(
     name = "GPU Mac Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac",
     ),
     tree_closing = False,
@@ -2962,17 +3158,17 @@ ci.gpu_mac_builder(
 
 ci.gpu_windows_builder(
     name = "GPU Win x64 Builder",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "Windows",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
 )
 
 ci.gpu_windows_builder(
     name = "GPU Win x64 Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows",
     ),
     tree_closing = False,
@@ -2980,7 +3176,7 @@ ci.gpu_windows_builder(
 
 ci.gpu_thin_tester(
     name = "Linux Debug (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux",
     ),
     triggered_by = ["GPU Linux Builder (dbg)"],
@@ -2989,9 +3185,9 @@ ci.gpu_thin_tester(
 
 ci.gpu_thin_tester(
     name = "Linux Release (NVIDIA)",
-    branch_selector = branches.STANDARD_RELEASES,
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    cq_mirrors_console_view = "mirrors",
+    console_view_entry = consoles.console_view_entry(
         category = "Linux",
     ),
     main_console_view = main_console_if_on_branch(),
@@ -3000,7 +3196,7 @@ ci.gpu_thin_tester(
 
 ci.gpu_thin_tester(
     name = "Mac Debug (Intel)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac",
     ),
     triggered_by = ["GPU Mac Builder (dbg)"],
@@ -3009,18 +3205,18 @@ ci.gpu_thin_tester(
 
 ci.gpu_thin_tester(
     name = "Mac Release (Intel)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "Mac",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("GPU Mac Builder")],
 )
 
 ci.gpu_thin_tester(
     name = "Mac Retina Debug (AMD)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac",
     ),
     triggered_by = ["GPU Mac Builder (dbg)"],
@@ -3029,18 +3225,18 @@ ci.gpu_thin_tester(
 
 ci.gpu_thin_tester(
     name = "Mac Retina Release (AMD)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "Mac",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("GPU Mac Builder")],
 )
 
 ci.gpu_thin_tester(
     name = "Win10 x64 Debug (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows",
     ),
     triggered_by = ["GPU Win x64 Builder (dbg)"],
@@ -3049,18 +3245,18 @@ ci.gpu_thin_tester(
 
 ci.gpu_thin_tester(
     name = "Win10 x64 Release (NVIDIA)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "Windows",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("GPU Win x64 Builder")],
 )
 
 ci.gpu_fyi_linux_builder(
     name = "Android FYI 32 Vk Release (Pixel 2)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|vk|Q32",
         short_name = "P2",
     ),
@@ -3068,7 +3264,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "Android FYI 32 dEQP Vk Release (Pixel 2)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|dqp|vk|Q32",
         short_name = "P2",
     ),
@@ -3076,7 +3272,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_thin_tester(
     name = "Android FYI 64 Perf (Pixel 2)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|Perf|Q64",
         short_name = "P2",
     ),
@@ -3085,7 +3281,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_linux_builder(
     name = "Android FYI 64 Vk Release (Pixel 2)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|vk|Q64",
         short_name = "P2",
     ),
@@ -3093,7 +3289,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "Android FYI 64 dEQP Vk Release (Pixel 2)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|dqp|vk|Q64",
         short_name = "P2",
     ),
@@ -3101,7 +3297,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "Android FYI Release (NVIDIA Shield TV)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|N64|NVDA",
         short_name = "STV",
     ),
@@ -3109,7 +3305,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "Android FYI Release (Nexus 5)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|L32",
         short_name = "N5",
     ),
@@ -3117,7 +3313,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "Android FYI Release (Nexus 5X)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|M64|QCOM",
         short_name = "N5X",
     ),
@@ -3125,7 +3321,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "Android FYI Release (Nexus 6)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|L32",
         short_name = "N6",
     ),
@@ -3133,7 +3329,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "Android FYI Release (Nexus 6P)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|M64|QCOM",
         short_name = "N6P",
     ),
@@ -3141,7 +3337,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "Android FYI Release (Nexus 9)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|M64|NVDA",
         short_name = "N9",
     ),
@@ -3149,7 +3345,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "Android FYI Release (Pixel 2)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|P32|QCOM",
         short_name = "P2",
     ),
@@ -3157,7 +3353,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "Android FYI SkiaRenderer GL (Nexus 5X)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|skgl|M64",
         short_name = "N5X",
     ),
@@ -3165,7 +3361,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "Android FYI SkiaRenderer Vulkan (Pixel 2)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|skv|P32",
         short_name = "P2",
     ),
@@ -3173,7 +3369,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "Android FYI dEQP Release (Nexus 5X)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|dqp|M64",
         short_name = "N5X",
     ),
@@ -3181,7 +3377,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "ChromeOS FYI Release (amd64-generic)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ChromeOS|amd64|generic",
         short_name = "x64",
     ),
@@ -3189,7 +3385,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "ChromeOS FYI Release (kevin)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ChromeOS|arm|kevin",
         short_name = "kvn",
     ),
@@ -3197,7 +3393,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "GPU FYI Linux Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Builder",
         short_name = "rel",
     ),
@@ -3205,7 +3401,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "GPU FYI Linux Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Builder",
         short_name = "dbg",
     ),
@@ -3213,7 +3409,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "GPU FYI Linux Ozone Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Builder",
         short_name = "ozn",
     ),
@@ -3221,7 +3417,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "GPU FYI Linux dEQP Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Builder",
         short_name = "dqp",
     ),
@@ -3229,7 +3425,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "GPU FYI Perf Android 64 Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Android|Perf|Builder",
         short_name = "64",
     ),
@@ -3237,7 +3433,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_linux_builder(
     name = "Linux FYI GPU TSAN Release",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux",
         short_name = "tsn",
     ),
@@ -3246,7 +3442,7 @@ ci.gpu_fyi_linux_builder(
 # Builder + tester.
 ci.gpu_fyi_linux_builder(
     name = "Linux FYI SkiaRenderer Dawn Release (Intel HD 630)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Intel",
         short_name = "skd",
     ),
@@ -3254,7 +3450,7 @@ ci.gpu_fyi_linux_builder(
 
 ci.gpu_fyi_mac_builder(
     name = "Mac FYI arm64 Release (Apple DTK)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac",
         short_name = "dtk",
     ),
@@ -3262,7 +3458,7 @@ ci.gpu_fyi_mac_builder(
 
 ci.gpu_fyi_mac_builder(
     name = "Mac FYI GPU ASAN Release",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac",
         short_name = "asn",
     ),
@@ -3270,7 +3466,7 @@ ci.gpu_fyi_mac_builder(
 
 ci.gpu_fyi_mac_builder(
     name = "GPU FYI Mac Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|Builder",
         short_name = "rel",
     ),
@@ -3278,7 +3474,7 @@ ci.gpu_fyi_mac_builder(
 
 ci.gpu_fyi_mac_builder(
     name = "GPU FYI Mac Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|Builder",
         short_name = "dbg",
     ),
@@ -3286,7 +3482,7 @@ ci.gpu_fyi_mac_builder(
 
 ci.gpu_fyi_mac_builder(
     name = "GPU FYI Mac dEQP Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|Builder",
         short_name = "dqp",
     ),
@@ -3294,7 +3490,7 @@ ci.gpu_fyi_mac_builder(
 
 ci.gpu_fyi_thin_tester(
     name = "Linux FYI Debug (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Nvidia",
         short_name = "dbg",
     ),
@@ -3303,7 +3499,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Linux FYI Experimental Release (Intel HD 630)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Intel",
         short_name = "exp",
     ),
@@ -3312,7 +3508,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Linux FYI Experimental Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Nvidia",
         short_name = "exp",
     ),
@@ -3321,7 +3517,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Linux FYI Ozone (Intel)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Intel",
         short_name = "ozn",
     ),
@@ -3330,7 +3526,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Linux FYI Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Nvidia",
         short_name = "rel",
     ),
@@ -3339,7 +3535,16 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Linux FYI Release (AMD R7 240)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
+        category = "Linux|AMD",
+        short_name = "240",
+    ),
+    triggered_by = ["GPU FYI Linux Builder"],
+)
+
+ci.gpu_fyi_thin_tester(
+    name = "Linux FYI Release (AMD RX 5500 XT)",
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|AMD",
         short_name = "rel",
     ),
@@ -3348,7 +3553,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Linux FYI Release (Intel HD 630)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Intel",
         short_name = "rel",
     ),
@@ -3357,7 +3562,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Linux FYI Release (Intel UHD 630)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Intel",
         short_name = "uhd",
     ),
@@ -3369,7 +3574,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Linux FYI SkiaRenderer Vulkan (Intel HD 630)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Intel",
         short_name = "skv",
     ),
@@ -3378,7 +3583,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Linux FYI SkiaRenderer Vulkan (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Nvidia",
         short_name = "skv",
     ),
@@ -3387,7 +3592,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Linux FYI dEQP Release (Intel HD 630)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Intel",
         short_name = "dqp",
     ),
@@ -3396,7 +3601,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Linux FYI dEQP Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Linux|Nvidia",
         short_name = "dqp",
     ),
@@ -3405,7 +3610,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Mac FYI Debug (Intel)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|Intel",
         short_name = "dbg",
     ),
@@ -3414,7 +3619,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Mac FYI Experimental Release (Intel)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|Intel",
         short_name = "exp",
     ),
@@ -3423,7 +3628,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Mac FYI Experimental Retina Release (AMD)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|AMD|Retina",
         short_name = "exp",
     ),
@@ -3432,7 +3637,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Mac FYI Experimental Retina Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|Nvidia",
         short_name = "exp",
     ),
@@ -3445,7 +3650,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Mac FYI Release (Intel)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|Intel",
         short_name = "rel",
     ),
@@ -3453,8 +3658,17 @@ ci.gpu_fyi_thin_tester(
 )
 
 ci.gpu_fyi_thin_tester(
+    name = "Mac FYI Release (Intel UHD 630)",
+    console_view_entry = consoles.console_view_entry(
+        category = "Mac|Intel",
+        short_name = "uhd",
+    ),
+    triggered_by = ["GPU FYI Mac Builder"],
+)
+
+ci.gpu_fyi_thin_tester(
     name = "Mac FYI Retina Debug (AMD)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|AMD|Retina",
         short_name = "dbg",
     ),
@@ -3463,7 +3677,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Mac FYI Retina Debug (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|Nvidia",
         short_name = "dbg",
     ),
@@ -3472,7 +3686,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Mac FYI Retina Release (AMD)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|AMD|Retina",
         short_name = "rel",
     ),
@@ -3481,7 +3695,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Mac FYI Retina Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|Nvidia",
         short_name = "rel",
     ),
@@ -3490,7 +3704,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Mac FYI dEQP Release AMD",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|AMD",
         short_name = "dqp",
     ),
@@ -3499,7 +3713,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Mac FYI dEQP Release Intel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|Intel",
         short_name = "dqp",
     ),
@@ -3508,7 +3722,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Mac Pro FYI Release (AMD)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Mac|AMD|Pro",
         short_name = "rel",
     ),
@@ -3517,7 +3731,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x64 Debug (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x64|Nvidia",
         short_name = "dbg",
     ),
@@ -3526,7 +3740,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x64 DX12 Vulkan Debug (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x64|Nvidia|dx12vk",
         short_name = "dbg",
     ),
@@ -3535,7 +3749,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x64 DX12 Vulkan Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x64|Nvidia|dx12vk",
         short_name = "rel",
     ),
@@ -3544,7 +3758,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x64 Exp Release (Intel HD 630)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x64|Intel",
         short_name = "exp",
     ),
@@ -3553,7 +3767,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x64 Exp Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x64|Nvidia",
         short_name = "exp",
     ),
@@ -3562,7 +3776,16 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x64 Release (AMD RX 550)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
+        category = "Windows|10|x64|AMD",
+        short_name = "550",
+    ),
+    triggered_by = ["GPU FYI Win x64 Builder"],
+)
+
+ci.gpu_fyi_thin_tester(
+    name = "Win10 FYI x64 Release (AMD RX 5500 XT)",
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x64|AMD",
         short_name = "rel",
     ),
@@ -3571,7 +3794,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x64 Release (Intel HD 630)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x64|Intel",
         short_name = "rel",
     ),
@@ -3580,7 +3803,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x64 Release (Intel UHD 630)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x64|Intel",
         short_name = "uhd",
     ),
@@ -3592,7 +3815,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x64|Nvidia",
         short_name = "gtx",
     ),
@@ -3602,7 +3825,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x64 Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x64|Nvidia",
         short_name = "rel",
     ),
@@ -3611,7 +3834,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x64 Release XR Perf (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x64|Nvidia",
         short_name = "xr",
     ),
@@ -3621,24 +3844,15 @@ ci.gpu_fyi_thin_tester(
 # Builder + tester.
 ci.gpu_fyi_windows_builder(
     name = "Win10 FYI x64 SkiaRenderer Dawn Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x64|Nvidia",
         short_name = "skd",
     ),
 )
 
 ci.gpu_fyi_thin_tester(
-    name = "Win10 FYI x64 SkiaRenderer GL (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
-        category = "Windows|10|x64|Nvidia",
-        short_name = "skgl",
-    ),
-    triggered_by = ["GPU FYI Win x64 Builder"],
-)
-
-ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x64 dEQP Release (Intel HD 630)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x64|Intel",
         short_name = "dqp",
     ),
@@ -3647,7 +3861,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x64 dEQP Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x64|Nvidia",
         short_name = "dqp",
     ),
@@ -3656,7 +3870,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x86 Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|10|x86|Nvidia",
         short_name = "rel",
     ),
@@ -3665,7 +3879,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win7 FYI Debug (AMD)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|7|x86|AMD",
         short_name = "dbg",
     ),
@@ -3674,7 +3888,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win7 FYI Release (AMD)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|7|x86|AMD",
         short_name = "rel",
     ),
@@ -3683,7 +3897,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win7 FYI Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|7|x86|Nvidia",
         short_name = "rel",
     ),
@@ -3692,7 +3906,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win7 FYI dEQP Release (AMD)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|7|x86|AMD",
         short_name = "dqp",
     ),
@@ -3701,7 +3915,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win7 FYI x64 Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|7|x64|Nvidia",
         short_name = "rel",
     ),
@@ -3710,7 +3924,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_thin_tester(
     name = "Win7 FYI x64 dEQP Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|7|x64|Nvidia",
         short_name = "dqp",
     ),
@@ -3719,7 +3933,7 @@ ci.gpu_fyi_thin_tester(
 
 ci.gpu_fyi_windows_builder(
     name = "GPU FYI Win Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|Builder|Release",
         short_name = "x86",
     ),
@@ -3727,7 +3941,7 @@ ci.gpu_fyi_windows_builder(
 
 ci.gpu_fyi_windows_builder(
     name = "GPU FYI Win Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|Builder|Debug",
         short_name = "x86",
     ),
@@ -3735,7 +3949,7 @@ ci.gpu_fyi_windows_builder(
 
 ci.gpu_fyi_windows_builder(
     name = "GPU FYI Win dEQP Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|Builder|dEQP",
         short_name = "x86",
     ),
@@ -3743,7 +3957,7 @@ ci.gpu_fyi_windows_builder(
 
 ci.gpu_fyi_windows_builder(
     name = "GPU FYI Win x64 Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|Builder|Release",
         short_name = "x64",
     ),
@@ -3751,7 +3965,7 @@ ci.gpu_fyi_windows_builder(
 
 ci.gpu_fyi_windows_builder(
     name = "GPU FYI Win x64 Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|Builder|Debug",
         short_name = "x64",
     ),
@@ -3759,7 +3973,7 @@ ci.gpu_fyi_windows_builder(
 
 ci.gpu_fyi_windows_builder(
     name = "GPU FYI Win x64 dEQP Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|Builder|dEQP",
         short_name = "x64",
     ),
@@ -3767,7 +3981,7 @@ ci.gpu_fyi_windows_builder(
 
 ci.gpu_fyi_windows_builder(
     name = "GPU FYI Win x64 DX12 Vulkan Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|Builder|dx12vk",
         short_name = "rel",
     ),
@@ -3775,7 +3989,7 @@ ci.gpu_fyi_windows_builder(
 
 ci.gpu_fyi_windows_builder(
     name = "GPU FYI Win x64 DX12 Vulkan Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|Builder|dx12vk",
         short_name = "dbg",
     ),
@@ -3783,7 +3997,7 @@ ci.gpu_fyi_windows_builder(
 
 ci.gpu_fyi_windows_builder(
     name = "GPU FYI XR Win x64 Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Windows|Builder|XR",
         short_name = "x64",
     ),
@@ -3791,7 +4005,7 @@ ci.gpu_fyi_windows_builder(
 
 ci.linux_builder(
     name = "Cast Audio Linux",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "cast",
         short_name = "aud",
     ),
@@ -3801,19 +4015,19 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Cast Linux",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "cast",
         short_name = "vid",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     goma_jobs = goma.jobs.J50,
-    main_console_view = settings.main_console_name,
+    main_console_view = "main",
 )
 
 ci.linux_builder(
     name = "Deterministic Fuchsia (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "fuchsia|x64",
         short_name = "det",
     ),
@@ -3825,7 +4039,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Deterministic Linux",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "det",
     ),
@@ -3841,7 +4055,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Deterministic Linux (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "debug|builder",
         short_name = "det",
     ),
@@ -3853,32 +4067,32 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Fuchsia ARM64",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "fuchsia|a64",
         short_name = "rel",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     extra_notifies = ["cr-fuchsia"],
 )
 
 ci.linux_builder(
     name = "Fuchsia x64",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "fuchsia|x64",
         short_name = "rel",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     extra_notifies = ["cr-fuchsia"],
 )
 
 ci.linux_builder(
     name = "Leak Detection Linux",
-    console_view = "chromium.fyi",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
+        console_view = "chromium.fyi",
         category = "linux",
         short_name = "lk",
     ),
@@ -3888,29 +4102,29 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Linux Builder",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "bld",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
 )
 
 ci.linux_builder(
     name = "Linux Builder (dbg)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "debug|builder",
         short_name = "64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
 )
 
 ci.linux_builder(
     name = "Linux Builder (dbg)(32)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "debug|builder",
         short_name = "32",
     ),
@@ -3919,38 +4133,38 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Linux Tests",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "tst",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     goma_backend = None,
-    main_console_view = settings.main_console_name,
+    main_console_view = "main",
     triggered_by = [builder_name("Linux Builder")],
 )
 
 ci.linux_builder(
     name = "Linux Tests (dbg)(1)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "debug|tester",
         short_name = "64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     triggered_by = [builder_name("Linux Builder (dbg)")],
 )
 
 ci.linux_builder(
     name = "fuchsia-arm64-cast",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "fuchsia|cast",
         short_name = "a64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     # Set tree_closing to false to disable the defaualt tree closer, which
     # filters by step name, and instead enable tree closing for any step
     # failure.
@@ -3960,7 +4174,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Network Service Linux",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "nsl",
     ),
@@ -3969,13 +4183,13 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "fuchsia-x64-cast",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "fuchsia|cast",
         short_name = "x64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     # Set tree_closing to false to disable the defaualt tree closer, which
     # filters by step name, and instead enable tree closing for any step
     # failure.
@@ -3985,7 +4199,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "fuchsia-x64-dbg",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "fuchsia|x64",
         short_name = "dbg",
     ),
@@ -3995,7 +4209,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "linux-bfcache-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "bfcache",
         short_name = "bfc",
     ),
@@ -4004,7 +4218,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "linux-gcc-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "gcc",
     ),
@@ -4014,13 +4228,13 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "linux-ozone-rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "ozo",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     # Set tree_closing to false to disable the defaualt tree closer, which
     # filters by step name, and instead enable tree closing for any step
     # failure.
@@ -4030,39 +4244,39 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "Linux Ozone Tester (Headless)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view = "chromium.fyi",
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
+        console_view = "chromium.fyi",
         category = "linux",
         short_name = "loh",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("linux-ozone-rel")],
 )
 
 ci.linux_builder(
     name = "Linux Ozone Tester (Wayland)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view = "chromium.fyi",
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
+        console_view = "chromium.fyi",
         category = "linux",
         short_name = "low",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("linux-ozone-rel")],
 )
 
 ci.linux_builder(
     name = "Linux Ozone Tester (X11)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view = "chromium.fyi",
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
+        console_view = "chromium.fyi",
         category = "linux",
         short_name = "lox",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     main_console_view = main_console_if_on_branch(),
     triggered_by = [builder_name("linux-ozone-rel")],
 )
@@ -4070,8 +4284,8 @@ ci.linux_builder(
 ci.linux_builder(
     # CI tester for Ozone/Headless
     name = "Linux Tester (Ozone Headless)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "release|ozone",
         short_name = "ltoh",
     ),
@@ -4084,8 +4298,8 @@ ci.linux_builder(
 ci.linux_builder(
     # CI tester for Ozone/Wayland
     name = "Linux Tester (Ozone Wayland)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "release|ozone",
         short_name = "ltow",
     ),
@@ -4098,8 +4312,8 @@ ci.linux_builder(
 ci.linux_builder(
     # CI tester for Ozone/X11
     name = "Linux Tester (Ozone X11)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "release|ozone",
         short_name = "ltox",
     ),
@@ -4111,7 +4325,7 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = "linux-trusty-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "tru",
     ),
@@ -4129,36 +4343,36 @@ ci.linux_builder(
 
 ci.mac_builder(
     name = "Mac Builder",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "bld",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     os = os.MAC_10_15,
 )
 
 ci.mac_builder(
     name = "Mac Builder (dbg)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "debug",
         short_name = "bld",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     os = os.MAC_ANY,
 )
 
 ci.mac_builder(
     name = "mac-arm64-rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "release|arm64",
         short_name = "bld",
     ),
-    main_console_view = settings.main_console_name,
+    main_console_view = "main",
     cores = None,
     os = os.MAC_ANY,
 )
@@ -4169,108 +4383,98 @@ ci.mac_builder(
 ci.thin_tester(
     name = "mac-arm64-rel-tests",
     builder_group = "chromium.fyi",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "mac",
         short_name = "a64",
     ),
+    # TODO(gbeaty) Once we have sufficient test capacity to not need to
+    # serialize tests, use the default execution_timout
+    execution_timeout = 6 * time.hour,
     tree_closing = False,
     triggered_by = [builder_name("mac-arm64-rel")],
 )
 
 ci.thin_tester(
-    name = "Mac10.10 Tests",
-    branch_selector = branches.STANDARD_RELEASES,
-    builder_group = "chromium.mac",
-    console_view_entry = ci.console_view_entry(
-        category = "release",
-        short_name = "10",
-    ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
-    triggered_by = [builder_name("Mac Builder")],
-)
-
-ci.thin_tester(
     name = "Mac10.11 Tests",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     builder_group = "chromium.mac",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "11",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     triggered_by = [builder_name("Mac Builder")],
 )
 
 ci.thin_tester(
     name = "Mac10.12 Tests",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     builder_group = "chromium.mac",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "12",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     triggered_by = [builder_name("Mac Builder")],
 )
 
 ci.thin_tester(
     name = "Mac10.13 Tests",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     builder_group = "chromium.mac",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "13",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     triggered_by = [builder_name("Mac Builder")],
 )
 
 ci.thin_tester(
     name = "Mac10.14 Tests",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     builder_group = "chromium.mac",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "14",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     triggered_by = [builder_name("Mac Builder")],
 )
 
 ci.thin_tester(
     name = "Mac10.15 Tests",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     builder_group = "chromium.mac",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "release",
         short_name = "15",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     triggered_by = [builder_name("Mac Builder")],
 )
 
 ci.thin_tester(
     name = "Mac10.13 Tests (dbg)",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     builder_group = "chromium.mac",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "debug",
         short_name = "13",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     triggered_by = [builder_name("Mac Builder (dbg)")],
 )
 
 ci.mac_ios_builder(
     name = "ios-device",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ios|default",
         short_name = "dev",
     ),
@@ -4281,29 +4485,29 @@ ci.mac_ios_builder(
 
 ci.mac_ios_builder(
     name = "ios-simulator",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "ios|default",
         short_name = "sim",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
 )
 
 ci.mac_ios_builder(
     name = "ios-simulator-full-configs",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "ios|default",
         short_name = "ful",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
 )
 
 ci.mac_ios_builder(
     name = "ios-simulator-noncq",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ios|default",
         short_name = "non",
     ),
@@ -4314,10 +4518,10 @@ ci.mac_ios_builder(
 
 ci.memory_builder(
     name = "Android CFI",
-    # TODO(https://crbug.com/1008094) When this builder is not consistently
-    # failing, remove the console_view value
-    console_view = "chromium.android.fyi",
-    console_view_entry = ci.console_view_entry(
+    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",
     ),
@@ -4330,54 +4534,54 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "Linux ASan LSan Builder",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "linux|asan lsan",
         short_name = "bld",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     ssd = True,
 )
 
 ci.memory_builder(
     name = "Linux ASan LSan Tests (1)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "linux|asan lsan",
         short_name = "tst",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     triggered_by = [builder_name("Linux ASan LSan Builder")],
 )
 
 ci.memory_builder(
     name = "Linux ASan Tests (sandboxed)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "linux|asan lsan",
         short_name = "sbx",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     triggered_by = [builder_name("Linux ASan LSan Builder")],
 )
 
 ci.memory_builder(
     name = "Linux TSan Builder",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "linux|TSan v2",
         short_name = "bld",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
 )
 
 ci.memory_builder(
     name = "Linux CFI",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "cfi",
         short_name = "lnx",
     ),
@@ -4390,7 +4594,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "Linux Chromium OS ASan LSan Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "cros|asan",
         short_name = "bld",
     ),
@@ -4402,7 +4606,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "Linux Chromium OS ASan LSan Tests (1)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "cros|asan",
         short_name = "tst",
     ),
@@ -4412,7 +4616,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "Linux ChromiumOS MSan Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "cros|msan",
         short_name = "bld",
     ),
@@ -4421,7 +4625,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "Linux ChromiumOS MSan Tests",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "cros|msan",
         short_name = "tst",
     ),
@@ -4431,7 +4635,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "Linux MSan Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux|msan",
         short_name = "bld",
     ),
@@ -4441,7 +4645,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "Linux MSan Tests",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux|msan",
         short_name = "tst",
     ),
@@ -4452,7 +4656,7 @@ ci.memory_builder(
 ci.memory_builder(
     name = "Mac ASan 64 Builder",
     builderless = False,
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "mac",
         short_name = "bld",
     ),
@@ -4468,20 +4672,20 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "Linux TSan Tests",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "linux|TSan v2",
         short_name = "tst",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     triggered_by = [builder_name("Linux TSan Builder")],
-    main_console_view = settings.main_console_name,
+    main_console_view = "main",
 )
 
 ci.memory_builder(
     name = "Mac ASan 64 Tests (1)",
     builderless = False,
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "mac",
         short_name = "tst",
     ),
@@ -4492,7 +4696,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "WebKit Linux ASAN",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux|webkit",
         short_name = "asn",
     ),
@@ -4501,7 +4705,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "WebKit Linux Leak",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux|webkit",
         short_name = "lk",
     ),
@@ -4510,7 +4714,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "WebKit Linux MSAN",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "linux|webkit",
         short_name = "msn",
     ),
@@ -4519,7 +4723,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "android-asan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "android",
         short_name = "asn",
     ),
@@ -4529,7 +4733,7 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = "win-asan",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "win",
         short_name = "asn",
     ),
@@ -4541,21 +4745,21 @@ ci.memory_builder(
 
 ci.mojo_builder(
     name = "Mojo Android",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         short_name = "and",
     ),
 )
 
 ci.mojo_builder(
     name = "Mojo ChromiumOS",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         short_name = "cr",
     ),
 )
 
 ci.mojo_builder(
     name = "Mojo Linux",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         short_name = "lnx",
     ),
 )
@@ -4563,7 +4767,7 @@ ci.mojo_builder(
 ci.mojo_builder(
     name = "Mojo Windows",
     builderless = False,
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         short_name = "win",
     ),
     os = os.WINDOWS_DEFAULT,
@@ -4571,14 +4775,14 @@ ci.mojo_builder(
 
 ci.mojo_builder(
     name = "android-mojo-webview-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         short_name = "aw",
     ),
 )
 
 ci.mojo_builder(
     name = "mac-mojo-rel",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         short_name = "mac",
     ),
     cores = 4,
@@ -4587,7 +4791,7 @@ ci.mojo_builder(
 
 ci.swangle_linux_builder(
     name = "linux-swangle-chromium-x64",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Chromium|Linux",
         short_name = "x64",
     ),
@@ -4596,7 +4800,7 @@ ci.swangle_linux_builder(
 
 ci.swangle_linux_builder(
     name = "linux-swangle-tot-angle-x64",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT ANGLE|Linux",
         short_name = "x64",
     ),
@@ -4604,7 +4808,7 @@ ci.swangle_linux_builder(
 
 ci.swangle_linux_builder(
     name = "linux-swangle-tot-angle-x86",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT ANGLE|Linux",
         short_name = "x86",
     ),
@@ -4612,7 +4816,7 @@ ci.swangle_linux_builder(
 
 ci.swangle_linux_builder(
     name = "linux-swangle-tot-swiftshader-x64",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT SwiftShader|Linux",
         short_name = "x64",
     ),
@@ -4620,7 +4824,7 @@ ci.swangle_linux_builder(
 
 ci.swangle_linux_builder(
     name = "linux-swangle-tot-swiftshader-x86",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT SwiftShader|Linux",
         short_name = "x86",
     ),
@@ -4628,7 +4832,7 @@ ci.swangle_linux_builder(
 
 ci.swangle_linux_builder(
     name = "linux-swangle-x64",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Linux",
         short_name = "x64",
     ),
@@ -4637,7 +4841,7 @@ ci.swangle_linux_builder(
 
 ci.swangle_linux_builder(
     name = "linux-swangle-x86",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Linux",
         short_name = "x86",
     ),
@@ -4646,7 +4850,7 @@ ci.swangle_linux_builder(
 
 ci.swangle_mac_builder(
     name = "mac-swangle-chromium-x64",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Chromium|Mac",
         short_name = "x64",
     ),
@@ -4655,7 +4859,7 @@ ci.swangle_mac_builder(
 
 ci.swangle_windows_builder(
     name = "win-swangle-chromium-x86",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "Chromium|Windows",
         short_name = "x86",
     ),
@@ -4664,7 +4868,7 @@ ci.swangle_windows_builder(
 
 ci.swangle_windows_builder(
     name = "win-swangle-tot-angle-x64",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT ANGLE|Windows",
         short_name = "x64",
     ),
@@ -4672,7 +4876,7 @@ ci.swangle_windows_builder(
 
 ci.swangle_windows_builder(
     name = "win-swangle-tot-angle-x86",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT ANGLE|Windows",
         short_name = "x86",
     ),
@@ -4680,7 +4884,7 @@ ci.swangle_windows_builder(
 
 ci.swangle_windows_builder(
     name = "win-swangle-tot-swiftshader-x64",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT SwiftShader|Windows",
         short_name = "x64",
     ),
@@ -4688,7 +4892,7 @@ ci.swangle_windows_builder(
 
 ci.swangle_windows_builder(
     name = "win-swangle-tot-swiftshader-x86",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "ToT SwiftShader|Windows",
         short_name = "x86",
     ),
@@ -4696,7 +4900,7 @@ ci.swangle_windows_builder(
 
 ci.swangle_windows_builder(
     name = "win-swangle-x64",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Windows",
         short_name = "x64",
     ),
@@ -4705,7 +4909,7 @@ ci.swangle_windows_builder(
 
 ci.swangle_windows_builder(
     name = "win-swangle-x86",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "DEPS|Windows",
         short_name = "x86",
     ),
@@ -4714,7 +4918,7 @@ ci.swangle_windows_builder(
 
 ci.win_builder(
     name = "WebKit Win10",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "misc",
         short_name = "wbk",
     ),
@@ -4724,7 +4928,7 @@ ci.win_builder(
 
 ci.win_builder(
     name = "Win Builder",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "release|builder",
         short_name = "32",
     ),
@@ -4735,7 +4939,7 @@ ci.win_builder(
 
 ci.win_builder(
     name = "Win x64 Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "debug|builder",
         short_name = "64",
     ),
@@ -4747,7 +4951,7 @@ ci.win_builder(
 
 ci.win_builder(
     name = "Win10 Tests x64 (dbg)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "debug|tester",
         short_name = "10",
     ),
@@ -4759,7 +4963,7 @@ ci.win_builder(
 
 ci.win_builder(
     name = "Win7 (32) Tests",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "release|tester",
         short_name = "32",
     ),
@@ -4770,7 +4974,7 @@ ci.win_builder(
 
 ci.win_builder(
     name = "Win7 Tests (1)",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "release|tester",
         short_name = "32",
     ),
@@ -4781,71 +4985,72 @@ ci.win_builder(
 
 ci.win_builder(
     name = "Win7 Tests (dbg)(1)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "debug|tester",
         short_name = "7",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     os = os.WINDOWS_7,
-    main_console_view = settings.main_console_name,
+    main_console_view = "main",
     triggered_by = [builder_name("Win Builder (dbg)")],
 )
 
 ci.win_builder(
     name = "Win 7 Tests x64 (1)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "release|tester",
         short_name = "64",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
+    cq_mirrors_console_view = "mirrors",
     os = os.WINDOWS_7,
-    main_console_view = settings.main_console_name,
+    main_console_view = "main",
     triggered_by = [builder_name("Win x64 Builder")],
 )
 
 ci.win_builder(
     name = "Win Builder (dbg)",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "debug|builder",
         short_name = "32",
     ),
     cores = 32,
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     os = os.WINDOWS_ANY,
 )
 
 ci.win_builder(
     name = "Win x64 Builder",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = consoles.console_view_entry(
         category = "release|builder",
         short_name = "64",
     ),
     cores = 32,
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     os = os.WINDOWS_ANY,
 )
 
 ci.win_builder(
     name = "Win10 Tests x64",
-    branch_selector = branches.STANDARD_RELEASES,
-    console_view_entry = ci.console_view_entry(
+    branch_selector = branches.STANDARD_MILESTONE,
+    executable = "recipe:chromium (bbagent)",
+    console_view_entry = consoles.console_view_entry(
         category = "release|tester",
         short_name = "w10",
     ),
-    cq_mirrors_console_view = settings.cq_mirrors_console_name,
-    main_console_view = settings.main_console_name,
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
     triggered_by = [builder_name("Win x64 Builder")],
 )
 
 ci.win_builder(
     name = "Windows deterministic",
-    console_view_entry = ci.console_view_entry(
+    console_view_entry = consoles.console_view_entry(
         category = "misc",
         short_name = "det",
     ),
diff --git a/chromium/infra/config/subprojects/chromium/consoles/android.packager.star b/chromium/infra/config/subprojects/chromium/consoles/android.packager.star
index a2b2d13ffae..56c88db1acc 100644
--- a/chromium/infra/config/subprojects/chromium/consoles/android.packager.star
+++ b/chromium/infra/config/subprojects/chromium/consoles/android.packager.star
@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+load("//console-header.star", "HEADER")
+
 luci.console_view(
     name = "android.packager",
-    header = "//chromium-header.textpb",
+    header = HEADER,
     repo = "https://chromium.googlesource.com/chromium/src",
     entries = [
         luci.console_view_entry(
@@ -15,5 +17,9 @@ luci.console_view(
             builder = "ci/android-sdk-packager",
             short_name = "sdk",
         ),
+        luci.console_view_entry(
+            builder = "ci/android-androidx-packager",
+            short_name = "androidx",
+        ),
     ],
 )
diff --git a/chromium/infra/config/subprojects/chromium/consoles/sheriff.ios.star b/chromium/infra/config/subprojects/chromium/consoles/sheriff.ios.star
index 34f0276601a..f0b22099717 100644
--- a/chromium/infra/config/subprojects/chromium/consoles/sheriff.ios.star
+++ b/chromium/infra/config/subprojects/chromium/consoles/sheriff.ios.star
@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+load("//console-header.star", "HEADER")
+
 luci.console_view(
     name = "sheriff.ios",
-    header = "//chromium-header.textpb",
+    header = HEADER,
     repo = "https://chromium.googlesource.com/chromium/src",
     title = "iOS Sheriff Console",
     entries = [
diff --git a/chromium/infra/config/subprojects/chromium/fallback-cq.star b/chromium/infra/config/subprojects/chromium/fallback-cq.star
index 4919e9268fd..79a2ff687d9 100644
--- a/chromium/infra/config/subprojects/chromium/fallback-cq.star
+++ b/chromium/infra/config/subprojects/chromium/fallback-cq.star
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-load("//project.star", "ACTIVE_BRANCHES")
+load("//project.star", "ACTIVE_MILESTONES")
 
 # Declare a CQ group that watches all branch heads, excluding the active
 # branches. We won't add any builders, but SUBMIT TO CQ fails on Gerrit if there
@@ -14,8 +14,8 @@ luci.cq_group(
         repo = "https://chromium.googlesource.com/chromium/src",
         refs = ["refs/branch-heads/.*"],
         refs_exclude = [
-            "refs/branch-heads/{}".format(branch_name)
-            for _, branch_name in ACTIVE_BRANCHES
+            details.ref
+            for details in ACTIVE_MILESTONES.values()
         ],
     ),
     acls = [
diff --git a/chromium/infra/config/subprojects/chromium/gpu.try.star b/chromium/infra/config/subprojects/chromium/gpu.try.star
index 68629494cea..9b7bcdbd58a 100644
--- a/chromium/infra/config/subprojects/chromium/gpu.try.star
+++ b/chromium/infra/config/subprojects/chromium/gpu.try.star
@@ -2,15 +2,33 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-load("//lib/builders.star", "goma", "os")
+load("//lib/builders.star", "cpu", "goma", "os")
 load("//lib/try.star", "try_")
-load("//project.star", "settings")
 
-try_.set_defaults(
-    settings,
+try_.defaults.set(
+    bucket = "try",
+    build_numbers = True,
+    caches = [
+        swarming.cache(
+            name = "win_toolchain",
+            path = "win_toolchain",
+        ),
+    ],
+    configure_kitchen = True,
+    cores = 8,
+    cpu = cpu.X86_64,
+    cq_group = "cq",
+    executable = "recipe:chromium_trybot",
     execution_timeout = 6 * time.hour,
-    subproject_list_view = "luci.chromium.try",
+    # Max. pending time for builds. CQ considers builds pending >2h as timed
+    # out: http://shortn/_8PaHsdYmlq. Keep this in sync.
+    expiration_timeout = 2 * time.hour,
+    os = os.LINUX_DEFAULT,
+    pool = "luci.chromium.try",
     service_account = "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com",
+    subproject_list_view = "luci.chromium.try",
+    swarming_tags = ["vpython:native-python-wrapper"],
+    task_template_canary_percentage = 5,
 )
 
 # Builders appear after the function used to define them, with all builders
@@ -141,6 +159,11 @@ def gpu_linux_builder(*, name, **kwargs):
     )
 
 gpu_linux_builder(
+    name = "gpu-fyi-try-linux-amd-rel",
+    pool = "luci.chromium.gpu.linux.amd.try",
+)
+
+gpu_linux_builder(
     name = "gpu-fyi-try-linux-intel-dqp",
     pool = "luci.chromium.gpu.linux.intel.try",
 )
@@ -275,6 +298,11 @@ gpu_mac_builder(
 )
 
 gpu_mac_builder(
+    name = "gpu-fyi-try-mac-intel-uhd-630-rel",
+    pool = "luci.chromium.gpu.mac.mini.intel.uhd630.try",
+)
+
+gpu_mac_builder(
     name = "gpu-fyi-try-mac-nvidia-retina-dbg",
     pool = "luci.chromium.gpu.mac.retina.nvidia.try",
 )
@@ -315,6 +343,11 @@ def gpu_win_builder(*, name, **kwargs):
     )
 
 gpu_win_builder(
+    name = "gpu-fyi-try-win10-amd-rel-64",
+    pool = "luci.chromium.gpu.win10.amd.try",
+)
+
+gpu_win_builder(
     name = "gpu-fyi-try-win10-intel-dqp-64",
     pool = "luci.chromium.gpu.win10.intel.try",
 )
@@ -360,11 +393,6 @@ gpu_win_builder(
 )
 
 gpu_win_builder(
-    name = "gpu-fyi-try-win10-nvidia-skgl-64",
-    pool = "luci.chromium.gpu.win10.nvidia.try",
-)
-
-gpu_win_builder(
     name = "gpu-fyi-try-win10-nvidia-rel-32",
     pool = "luci.chromium.gpu.win10.nvidia.try",
 )
diff --git a/chromium/infra/config/subprojects/chromium/subproject.star b/chromium/infra/config/subprojects/chromium/subproject.star
index faacd790617..8be4feaf25d 100644
--- a/chromium/infra/config/subprojects/chromium/subproject.star
+++ b/chromium/infra/config/subprojects/chromium/subproject.star
@@ -9,10 +9,6 @@ exec("./try.star")
 exec("./gpu.try.star")
 exec("./swangle.try.star")
 
-# Execute the M85 config
-branches.exec("./versioned/m85/buckets/ci.star")
-branches.exec("./versioned/m85/buckets/try.star")
-
 # TODO(gbeaty) external_console_view uses new fields/types that aren't present
 # in the version of the protobuf that lint-luci-milo uses, so update protos and
 # then uncomment these (the main console is still reachable via the beta link in
diff --git a/chromium/infra/config/subprojects/chromium/swangle.try.star b/chromium/infra/config/subprojects/chromium/swangle.try.star
index a19806f3144..70d9432ea97 100644
--- a/chromium/infra/config/subprojects/chromium/swangle.try.star
+++ b/chromium/infra/config/subprojects/chromium/swangle.try.star
@@ -2,14 +2,33 @@
 # 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/try.star", "try_")
-load("//project.star", "settings")
 
-try_.set_defaults(
-    settings,
+try_.defaults.set(
+    bucket = "try",
+    build_numbers = True,
+    caches = [
+        swarming.cache(
+            name = "win_toolchain",
+            path = "win_toolchain",
+        ),
+    ],
+    configure_kitchen = True,
+    cores = 8,
+    cpu = cpu.X86_64,
+    cq_group = "cq",
+    executable = "recipe:chromium_trybot",
     execution_timeout = 2 * time.hour,
-    subproject_list_view = "luci.chromium.try",
+    # Max. pending time for builds. CQ considers builds pending >2h as timed
+    # out: http://shortn/_8PaHsdYmlq. Keep this in sync.
+    expiration_timeout = 2 * time.hour,
+    os = os.LINUX_DEFAULT,
+    pool = "luci.chromium.try",
     service_account = "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com",
+    subproject_list_view = "luci.chromium.try",
+    swarming_tags = ["vpython:native-python-wrapper"],
+    task_template_canary_percentage = 5,
 )
 
 try_.chromium_swangle_linux_builder(
diff --git a/chromium/infra/config/subprojects/chromium/try.star b/chromium/infra/config/subprojects/chromium/try.star
index 1b065736d6e..9d9aa53b29d 100644
--- a/chromium/infra/config/subprojects/chromium/try.star
+++ b/chromium/infra/config/subprojects/chromium/try.star
@@ -3,75 +3,148 @@
 # found in the LICENSE file.
 
 load("//lib/branches.star", "branches")
-load("//lib/builders.star", "goma", "os", "xcode_cache")
+load("//lib/builders.star", "cpu", "goma", "os", "xcode")
+load("//lib/consoles.star", "consoles")
 load("//lib/try.star", "try_")
 load("//project.star", "settings")
 
-try_.declare_bucket(settings, branch_selector = branches.ALL_RELEASES)
-
-try_.set_defaults(
-    settings,
-    add_to_list_view = True,
+try_.defaults.set(
+    bucket = "try",
+    build_numbers = True,
+    caches = [
+        swarming.cache(
+            name = "win_toolchain",
+            path = "win_toolchain",
+        ),
+    ],
+    configure_kitchen = True,
+    cores = 8,
+    cpu = cpu.X86_64,
+    cq_group = "cq",
+    executable = "recipe:chromium_trybot",
+    execution_timeout = 4 * time.hour,
+    # Max. pending time for builds. CQ considers builds pending >2h as timed
+    # out: http://shortn/_8PaHsdYmlq. Keep this in sync.
+    expiration_timeout = 2 * time.hour,
+    os = os.LINUX_DEFAULT,
+    pool = "luci.chromium.try",
+    service_account = "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com",
     subproject_list_view = "luci.chromium.try",
+    swarming_tags = ["vpython:native-python-wrapper"],
+    task_template_canary_percentage = 5,
+)
+
+luci.bucket(
+    name = "try",
+    acls = [
+        acl.entry(
+            roles = acl.BUILDBUCKET_READER,
+            groups = "all",
+        ),
+        acl.entry(
+            roles = acl.BUILDBUCKET_TRIGGERER,
+            users = [
+                "findit-for-me@appspot.gserviceaccount.com",
+                "tricium-prod@appspot.gserviceaccount.com",
+            ],
+            groups = [
+                "project-chromium-tryjob-access",
+                # Allow Pinpoint to trigger builds for bisection
+                "service-account-chromeperf",
+                "service-account-cq",
+            ],
+            projects = settings.try_triggering_projects,
+        ),
+        acl.entry(
+            roles = acl.BUILDBUCKET_OWNER,
+            groups = "service-account-chromium-tryserver",
+        ),
+    ],
+)
+
+luci.cq_group(
+    name = "cq",
+    retry_config = cq.RETRY_ALL_FAILURES,
+    tree_status_host = settings.tree_status_host,
+    watch = cq.refset(
+        repo = "https://chromium.googlesource.com/chromium/src",
+        refs = [settings.cq_ref_regexp],
+    ),
+    acls = [
+        acl.entry(
+            acl.CQ_COMMITTER,
+            groups = "project-chromium-committers",
+        ),
+        acl.entry(
+            acl.CQ_DRY_RUNNER,
+            groups = "project-chromium-tryjob-access",
+        ),
+    ],
 )
 
 # Automatically maintained consoles
 
-try_.list_view(
+consoles.list_view(
+    name = "try",
+    title = settings.main_list_view_title,
+    branch_selector = branches.ALL_BRANCHES,
+)
+
+consoles.list_view(
     name = "luci.chromium.try",
-    branch_selector = branches.ALL_RELEASES,
+    branch_selector = branches.ALL_BRANCHES,
 )
 
-try_.list_view(
+consoles.list_view(
     name = "tryserver.blink",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
 
-try_.list_view(
+consoles.list_view(
     name = "tryserver.chromium",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
 
-try_.list_view(
+consoles.list_view(
     name = "tryserver.chromium.android",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
 
-try_.list_view(
+consoles.list_view(
     name = "tryserver.chromium.angle",
 )
 
-try_.list_view(
+consoles.list_view(
     name = "tryserver.chromium.chromiumos",
-    branch_selector = branches.ALL_RELEASES,
+    branch_selector = branches.ALL_BRANCHES,
 )
 
-try_.list_view(
+consoles.list_view(
     name = "tryserver.chromium.codesearch",
 )
 
-try_.list_view(
+consoles.list_view(
     name = "tryserver.chromium.dawn",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
 
-try_.list_view(
+consoles.list_view(
     name = "tryserver.chromium.linux",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
 
-try_.list_view(
+consoles.list_view(
     name = "tryserver.chromium.mac",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
 
-try_.list_view(
+consoles.list_view(
     name = "tryserver.chromium.swangle",
 )
 
-try_.list_view(
+consoles.list_view(
     name = "tryserver.chromium.win",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
 
 # Builders are sorted first lexicographically by the function used to define
@@ -84,9 +157,9 @@ try_.blink_builder(
 
 try_.blink_builder(
     name = "linux-blink-rel",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     goma_backend = goma.backend.RBE_PROD,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/cc/.+",
@@ -134,39 +207,39 @@ try_.blink_mac_builder(
 
 try_.chromium_builder(
     name = "android-official",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     cores = 32,
 )
 
 try_.chromium_builder(
     name = "fuchsia-official",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     cores = 32,
 )
 
 try_.chromium_builder(
     name = "linux-official",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     cores = 32,
 )
 
 try_.chromium_builder(
     name = "mac-official",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     cores = None,
     os = os.MAC_ANY,
 )
 
 try_.chromium_builder(
     name = "win-official",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     os = os.WINDOWS_DEFAULT,
     cores = 32,
 )
 
 try_.chromium_builder(
     name = "win32-official",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     os = os.WINDOWS_DEFAULT,
     cores = 32,
 )
@@ -176,6 +249,10 @@ try_.chromium_android_builder(
 )
 
 try_.chromium_android_builder(
+    name = "android-11-x86-fyi-rel",
+)
+
+try_.chromium_android_builder(
     name = "android-asan",
 )
 
@@ -185,20 +262,22 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android-binary-size",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     executable = "recipe:binary_size_trybot",
     goma_jobs = goma.jobs.J150,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     properties = {
         "$build/binary_size": {
             "analyze_targets": [
-                "//chrome/android:validate_expectations",
                 "//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",
             ],
         },
@@ -208,8 +287,8 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android-cronet-arm-dbg",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/components/cronet/.+",
@@ -240,19 +319,23 @@ try_.chromium_android_builder(
 )
 
 try_.chromium_android_builder(
+    name = "android-inverse-fieldtrials-pie-x86-fyi-rel",
+)
+
+try_.chromium_android_builder(
     name = "android-lollipop-arm-rel",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     goma_jobs = goma.jobs.J150,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
 try_.chromium_android_builder(
     name = "android-marshmallow-arm64-rel",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     cores = 16,
     goma_jobs = goma.jobs.J300,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     ssd = True,
     use_java_coverage = True,
     tryjob = try_.job(),
@@ -260,12 +343,12 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android-marshmallow-x86-rel",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     cores = 16,
     goma_jobs = goma.jobs.J300,
     ssd = True,
     tryjob = try_.job(
-        experiment_percentage = 20,
+        experiment_percentage = 100,
     ),
 )
 
@@ -277,9 +360,9 @@ try_.chromium_android_builder(
 # back to NJH47F
 #try_.chromium_android_builder(
 #    name = "android-nougat-arm64-rel",
-#    branch_selector = branches.STANDARD_RELEASES,
+#    branch_selector = branches.STANDARD_MILESTONE,
 #    goma_jobs = goma.jobs.J150,
-#    main_list_view = settings.main_list_view_name,
+#    main_list_view = 'try',
 #)
 
 try_.chromium_android_builder(
@@ -296,9 +379,9 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android-pie-arm64-dbg",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     goma_jobs = goma.jobs.J300,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/chrome/android/features/vr/.+",
@@ -317,15 +400,12 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android-pie-arm64-rel",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     cores = 16,
     goma_jobs = goma.jobs.J300,
     ssd = True,
-    # TODO(crbug.com/1111436): Enable on CQ fully once the tests run fine.
-    main_list_view = settings.main_list_view_name,
-    tryjob = try_.job(
-        experiment_percentage = 60,
-    ),
+    main_list_view = "try",
+    tryjob = try_.job(),
 )
 
 try_.chromium_android_builder(
@@ -346,10 +426,6 @@ try_.chromium_android_builder(
 )
 
 try_.chromium_android_builder(
-    name = "android-weblayer-pie-x86-fyi-rel",
-)
-
-try_.chromium_android_builder(
     name = "android-webview-marshmallow-arm64-dbg",
 )
 
@@ -394,16 +470,17 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android_compile_dbg",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
+    builderless = not settings.is_master,
     goma_jobs = goma.jobs.J150,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
 try_.chromium_android_builder(
     name = "android_compile_x64_dbg",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+",
@@ -420,8 +497,8 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android_compile_x86_dbg",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+",
@@ -438,8 +515,9 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "android_cronet",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    builderless = not settings.is_master,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
@@ -457,8 +535,9 @@ try_.chromium_android_builder(
 
 try_.chromium_android_builder(
     name = "cast_shell_android",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    builderless = not settings.is_master,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
@@ -542,8 +621,8 @@ try_.chromium_chromiumos_builder(
 
 try_.chromium_chromiumos_builder(
     name = "chromeos-amd64-generic-dbg",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/content/gpu/.+",
@@ -554,8 +633,8 @@ try_.chromium_chromiumos_builder(
 
 try_.chromium_chromiumos_builder(
     name = "chromeos-amd64-generic-rel",
-    branch_selector = branches.ALL_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.ALL_BRANCHES,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
@@ -565,15 +644,16 @@ try_.chromium_chromiumos_builder(
 
 try_.chromium_chromiumos_builder(
     name = "chromeos-arm-generic-rel",
-    branch_selector = branches.ALL_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.ALL_BRANCHES,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
 try_.chromium_chromiumos_builder(
     name = "linux-chromeos-compile-dbg",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    builderless = not settings.is_master,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
@@ -583,8 +663,8 @@ try_.chromium_chromiumos_builder(
 
 try_.chromium_chromiumos_builder(
     name = "chromeos-kevin-rel",
-    branch_selector = branches.ALL_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.ALL_BRANCHES,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/build/chromeos/.+",
@@ -596,16 +676,20 @@ try_.chromium_chromiumos_builder(
 
 try_.chromium_chromiumos_builder(
     name = "linux-chromeos-rel",
-    branch_selector = branches.ALL_RELEASES,
+    branch_selector = branches.ALL_BRANCHES,
+    builderless = not settings.is_master,
     goma_jobs = goma.jobs.J150,
-    main_list_view = settings.main_list_view_name,
-    tryjob = try_.job(cancel_stale = False),
+    main_list_view = "try",
+    tryjob = try_.job(),
     use_clang_coverage = True,
 )
 
 try_.chromium_chromiumos_builder(
     name = "linux-lacros-rel",
-    main_list_view = settings.main_list_view_name,
+    cores = 16,
+    ssd = True,
+    goma_jobs = goma.jobs.J300,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
@@ -615,8 +699,8 @@ try_.chromium_chromiumos_builder(
 
 try_.chromium_dawn_builder(
     name = "dawn-linux-x64-deps-rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/gpu/.+",
@@ -634,8 +718,8 @@ try_.chromium_dawn_builder(
 
 try_.chromium_dawn_builder(
     name = "dawn-mac-x64-deps-rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     os = os.MAC_ANY,
     tryjob = try_.job(
         location_regexp = [
@@ -654,8 +738,8 @@ try_.chromium_dawn_builder(
 
 try_.chromium_dawn_builder(
     name = "dawn-win10-x64-deps-rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     os = os.WINDOWS_ANY,
     tryjob = try_.job(
         location_regexp = [
@@ -674,8 +758,8 @@ try_.chromium_dawn_builder(
 
 try_.chromium_dawn_builder(
     name = "dawn-win10-x86-deps-rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     os = os.WINDOWS_ANY,
     tryjob = try_.job(
         location_regexp = [
@@ -722,29 +806,23 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "cast_shell_linux",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    builderless = not settings.is_master,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
 try_.chromium_linux_builder(
-    name = "closure_compilation",
-    branch_selector = branches.STANDARD_RELEASES,
-    executable = "recipe:closure_compilation",
-    main_list_view = settings.main_list_view_name,
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/third_party/closure_compiler/.+",
-        ],
-    ),
-)
-
-try_.chromium_linux_builder(
     name = "chromium_presubmit",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     executable = "recipe:presubmit",
     goma_backend = None,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
+    # Default priority for buildbucket is 30, see
+    # https://chromium.googlesource.com/infra/infra/+/bb68e62b4380ede486f65cd32d9ff3f1bbe288e4/appengine/cr-buildbucket/creation.py#42
+    # This will improve our turnaround time for landing infra/config changes
+    # when addressing outages
+    priority = 25,
     properties = {
         "$depot_tools/presubmit": {
             "runhooks": True,
@@ -760,8 +838,8 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "fuchsia-arm64-cast",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/chromecast/.+",
@@ -777,6 +855,11 @@ try_.chromium_linux_builder(
 )
 
 try_.chromium_linux_builder(
+    name = "fuchsia-deterministic-dbg",
+    executable = "recipe:swarming/deterministic_build",
+)
+
+try_.chromium_linux_builder(
     name = "fuchsia-fyi-arm64-dbg",
 )
 
@@ -794,22 +877,22 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "fuchsia-x64-cast",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
 try_.chromium_linux_builder(
     name = "fuchsia_arm64",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
 try_.chromium_linux_builder(
     name = "fuchsia_x64",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
@@ -842,6 +925,10 @@ try_.chromium_linux_builder(
 )
 
 try_.chromium_linux_builder(
+    name = "linux-blink-web-tests-force-accessibility-rel",
+)
+
+try_.chromium_linux_builder(
     name = "linux-clang-tidy-dbg",
     executable = "recipe:tricium_clang_tidy_wrapper",
     goma_jobs = goma.jobs.J150,
@@ -880,16 +967,16 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux-libfuzzer-asan-rel",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     executable = "recipe:chromium_libfuzzer_trybot",
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
 try_.chromium_linux_builder(
     name = "linux-ozone-rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
@@ -909,9 +996,9 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux-rel",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     goma_jobs = goma.jobs.J150,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     tryjob = try_.job(),
     use_clang_coverage = True,
 )
@@ -960,10 +1047,10 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux_chromium_asan_rel_ng",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     goma_jobs = goma.jobs.J150,
     ssd = True,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
@@ -998,7 +1085,8 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux_chromium_compile_dbg_ng",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
+    builderless = not settings.is_master,
     caches = [
         swarming.cache(
             name = "builder",
@@ -1006,7 +1094,7 @@ try_.chromium_linux_builder(
         ),
     ],
     goma_jobs = goma.jobs.J150,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
@@ -1016,14 +1104,14 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux_chromium_dbg_ng",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     caches = [
         swarming.cache(
             name = "builder",
             path = "linux_debug",
         ),
     ],
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/build/.*check_gn_headers.*",
@@ -1038,9 +1126,9 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux_chromium_tsan_rel_ng",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     goma_jobs = goma.jobs.J150,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
@@ -1050,8 +1138,8 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux_layout_tests_composite_after_paint",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/third_party/blink/renderer/core/paint/.+",
@@ -1064,8 +1152,8 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux_layout_tests_layout_ng_disabled",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/third_party/blink/renderer/core/editing/.+",
@@ -1099,8 +1187,8 @@ try_.chromium_linux_builder(
 
 try_.chromium_linux_builder(
     name = "linux_vr",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/chrome/browser/vr/.+",
@@ -1118,12 +1206,9 @@ try_.chromium_linux_builder(
     executable = "recipe:tricium_metrics",
 )
 
-try_.chromium_mac_builder(
-    name = "mac-coverage-rel",
-    builderless = False,
-    use_clang_coverage = True,
-    goma_jobs = goma.jobs.J150,
-    tryjob = try_.job(experiment_percentage = 8),
+try_.chromium_linux_builder(
+    name = "tricium-simple",
+    executable = "recipe:tricium_simple",
 )
 
 try_.chromium_mac_builder(
@@ -1133,17 +1218,17 @@ try_.chromium_mac_builder(
 
 try_.chromium_mac_builder(
     name = "mac-rel",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     use_clang_coverage = True,
     goma_jobs = goma.jobs.J150,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     os = os.MAC_DEFAULT,
     tryjob = try_.job(),
 )
 
 try_.chromium_mac_builder(
     name = "mac-arm64-rel",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     goma_jobs = goma.jobs.J150,
     os = os.MAC_10_15,
 )
@@ -1152,10 +1237,6 @@ try_.chromium_mac_builder(
 # they are built, hence no additional dimension is specified.
 # The 10.xx version translates to which bots will run isolated tests.
 try_.chromium_mac_builder(
-    name = "mac_chromium_10.10",
-)
-
-try_.chromium_mac_builder(
     name = "mac_chromium_10.12_rel_ng",
 )
 
@@ -1187,10 +1268,10 @@ try_.chromium_mac_builder(
 
 try_.chromium_mac_builder(
     name = "mac_chromium_compile_dbg_ng",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     goma_jobs = goma.jobs.J150,
     os = os.MAC_DEFAULT,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     tryjob = try_.job(cancel_stale = False),
 )
 
@@ -1205,20 +1286,9 @@ try_.chromium_mac_builder(
 try_.chromium_mac_builder(
     name = "mac_upload_clang",
     builderless = False,
-    caches = [
-        swarming.cache(
-            name = "xcode_mac_9a235",
-            path = "xcode_mac_9a235.app",
-        ),
-    ],
     executable = "recipe:chromium_upload_clang",
     execution_timeout = 6 * time.hour,
     goma_backend = None,  # Does not use Goma.
-    properties = {
-        "$depot_tools/osx_sdk": {
-            "sdk_version": "9a235",
-        },
-    },
 )
 
 try_.chromium_mac_ios_builder(
@@ -1227,8 +1297,8 @@ try_.chromium_mac_ios_builder(
 
 try_.chromium_mac_ios_builder(
     name = "ios-simulator",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(),
 )
 
@@ -1238,6 +1308,14 @@ try_.chromium_mac_ios_builder(
     coverage_exclude_sources = "ios_test_files_and_test_utils",
     coverage_test_types = ["unit"],
     os = os.MAC_10_15,
+)
+
+try_.chromium_mac_ios_builder(
+    name = "ios-simulator-coverage-exp",
+    use_clang_coverage = True,
+    coverage_exclude_sources = "ios_test_files_and_test_utils",
+    coverage_test_types = ["unit"],
+    os = os.MAC_10_15,
     tryjob = try_.job(experiment_percentage = 3),
 )
 
@@ -1247,12 +1325,8 @@ try_.chromium_mac_ios_builder(
 
 try_.chromium_mac_ios_builder(
     name = "ios-simulator-cronet",
-    branch_selector = branches.STANDARD_RELEASES,
-    caches = [xcode_cache.x11e146],
-    main_list_view = settings.main_list_view_name,
-    properties = {
-        "xcode_build_version": "11e146",
-    },
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/components/cronet/.+",
@@ -1263,13 +1337,28 @@ try_.chromium_mac_ios_builder(
             ".+/[+]/components/cronet/android/.+",
         ],
     ),
+    xcode = xcode.x11e146,
 )
 
 try_.chromium_mac_ios_builder(
     name = "ios-simulator-full-configs",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
+    tryjob = try_.job(
+        location_regexp = [
+            ".+/[+]/ios/.+",
+        ],
+    ),
+)
+
+try_.chromium_mac_ios_builder(
+    name = "ios-simulator-full-configs-coverage-exp",
+    use_clang_coverage = True,
+    coverage_exclude_sources = "ios_test_files_and_test_utils",
+    coverage_test_types = ["unit"],
+    os = os.MAC_10_15,
     tryjob = try_.job(
+        experiment_percentage = 3,
         location_regexp = [
             ".+/[+]/ios/.+",
         ],
@@ -1298,10 +1387,7 @@ try_.chromium_mac_ios_builder(
 
 try_.chromium_mac_ios_builder(
     name = "ios14-sdk-simulator",
-    caches = [xcode_cache.x12b5018i],
-    properties = {
-        "xcode_build_version": "12b5018i",
-    },
+    xcode = [xcode.x12b5035g],
 )
 
 try_.chromium_win_builder(
@@ -1326,10 +1412,10 @@ try_.chromium_win_builder(
 
 try_.chromium_win_builder(
     name = "win-libfuzzer-asan-rel",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     builderless = False,
     executable = "recipe:chromium_libfuzzer_trybot",
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     os = os.WINDOWS_ANY,
     tryjob = try_.job(cancel_stale = False),
 )
@@ -1340,9 +1426,9 @@ try_.chromium_win_builder(
 
 try_.chromium_win_builder(
     name = "win_chromium_compile_dbg_ng",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     goma_jobs = goma.jobs.J150,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     tryjob = try_.job(cancel_stale = False),
 )
 
@@ -1388,12 +1474,15 @@ try_.chromium_win_builder(
 
 try_.chromium_win_builder(
     name = "win10_chromium_x64_rel_ng",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     goma_jobs = goma.jobs.J150,
     os = os.WINDOWS_10,
     ssd = True,
     use_clang_coverage = True,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
+    # TODO(https://crbug/1127113): Recipe Engine doesn't handle cancellations
+    # of stale tryjobs gracefully, resulting in longer average build times.
+    # Windows is particularly susceptible to this.
     tryjob = try_.job(cancel_stale = False),
 )
 
@@ -1404,11 +1493,16 @@ try_.chromium_win_builder(
 )
 
 try_.chromium_win_builder(
+    name = "win10-inverse-fieldtrials-fyi-rel",
+    os = os.WINDOWS_10,
+)
+
+try_.chromium_win_builder(
     name = "win7-rel",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     execution_timeout = 4 * time.hour + 30 * time.minute,
     goma_jobs = goma.jobs.J300,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     ssd = True,
     tryjob = try_.job(
         location_regexp = [
@@ -1419,8 +1513,8 @@ try_.chromium_win_builder(
 
 try_.gpu_chromium_android_builder(
     name = "android_optional_gpu_tests_rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/cc/.+",
@@ -1445,8 +1539,8 @@ try_.gpu_chromium_android_builder(
 
 try_.gpu_chromium_linux_builder(
     name = "linux_optional_gpu_tests_rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/chrome/browser/vr/.+",
@@ -1469,8 +1563,8 @@ try_.gpu_chromium_linux_builder(
 
 try_.gpu_chromium_mac_builder(
     name = "mac_optional_gpu_tests_rel",
-    branch_selector = branches.STANDARD_RELEASES,
-    main_list_view = settings.main_list_view_name,
+    branch_selector = branches.STANDARD_MILESTONE,
+    main_list_view = "try",
     tryjob = try_.job(
         location_regexp = [
             ".+/[+]/chrome/browser/vr/.+",
@@ -1494,9 +1588,9 @@ try_.gpu_chromium_mac_builder(
 
 try_.gpu_chromium_win_builder(
     name = "win_optional_gpu_tests_rel",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
     builderless = True,
-    main_list_view = settings.main_list_view_name,
+    main_list_view = "try",
     os = os.WINDOWS_DEFAULT,
     tryjob = try_.job(
         location_regexp = [
@@ -1572,17 +1666,21 @@ chrome_internal_verifier(
 )
 
 chrome_internal_verifier(
+    builder = "lacros-chrome",
+)
+
+chrome_internal_verifier(
     builder = "linux-chrome",
 )
 
 chrome_internal_verifier(
     builder = "linux-chrome-beta",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
 
 chrome_internal_verifier(
     builder = "linux-chrome-stable",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
 
 chrome_internal_verifier(
@@ -1590,21 +1688,17 @@ chrome_internal_verifier(
 )
 
 chrome_internal_verifier(
-    builder = "linux-chromeos-chrome-easwa",
-)
-
-chrome_internal_verifier(
     builder = "mac-chrome",
 )
 
 chrome_internal_verifier(
     builder = "mac-chrome-beta",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
 
 chrome_internal_verifier(
     builder = "mac-chrome-stable",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
 
 chrome_internal_verifier(
@@ -1613,12 +1707,12 @@ chrome_internal_verifier(
 
 chrome_internal_verifier(
     builder = "win-chrome-beta",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
 
 chrome_internal_verifier(
     builder = "win-chrome-stable",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
 
 chrome_internal_verifier(
@@ -1627,10 +1721,10 @@ chrome_internal_verifier(
 
 chrome_internal_verifier(
     builder = "win64-chrome-beta",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
 
 chrome_internal_verifier(
     builder = "win64-chrome-stable",
-    branch_selector = branches.STANDARD_RELEASES,
+    branch_selector = branches.STANDARD_MILESTONE,
 )
diff --git a/chromium/infra/config/subprojects/chromium/versioned/README.md b/chromium/infra/config/subprojects/chromium/versioned/README.md
deleted file mode 100644
index 7998f0a6322..00000000000
--- a/chromium/infra/config/subprojects/chromium/versioned/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-This directory supports our branch CI/CQ configuration.
-
-Contents:
-
-* **m84**, **m85**
-  * contains subdirectories that contain the versioned configuration for the
-  active milestones
-  * non-dimension changes should be infrequent
-  * more recent milestones will use separate project instead
diff --git a/chromium/infra/config/subprojects/chromium/versioned/m85/buckets/ci.star b/chromium/infra/config/subprojects/chromium/versioned/m85/buckets/ci.star
deleted file mode 100644
index e7dda32b856..00000000000
--- a/chromium/infra/config/subprojects/chromium/versioned/m85/buckets/ci.star
+++ /dev/null
@@ -1,810 +0,0 @@
-# Copyright 2020 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", "builder_name", "goma", "os")
-load("//lib/ci.star", "ci")
-
-# Load this using relative path so that the load statement doesn't
-# need to be changed when making a new milestone
-load("../vars.star", "vars")
-
-ci.set_defaults(
-    vars,
-    bucketed_triggers = True,
-    main_console_view = vars.main_console_name,
-    cq_mirrors_console_view = vars.cq_mirrors_console_name,
-)
-
-ci.declare_bucket(vars)
-
-# Builders are sorted first lexicographically by the function used to define
-# them, then lexicographically by their name
-
-ci.android_builder(
-    name = "Android WebView M (dbg)",
-    console_view_entry = ci.console_view_entry(
-        category = "tester|webview",
-        short_name = "M",
-    ),
-    triggered_by = [builder_name("Android arm64 Builder (dbg)")],
-)
-
-ci.android_builder(
-    name = "Android WebView N (dbg)",
-    console_view_entry = ci.console_view_entry(
-        category = "tester|webview",
-        short_name = "N",
-    ),
-    triggered_by = [builder_name("Android arm64 Builder (dbg)")],
-)
-
-ci.android_builder(
-    name = "Android WebView O (dbg)",
-    console_view_entry = ci.console_view_entry(
-        category = "tester|webview",
-        short_name = "O",
-    ),
-    triggered_by = [builder_name("Android arm64 Builder (dbg)")],
-)
-
-ci.android_builder(
-    name = "Android WebView P (dbg)",
-    console_view_entry = ci.console_view_entry(
-        category = "tester|webview",
-        short_name = "P",
-    ),
-    triggered_by = [builder_name("Android arm64 Builder (dbg)")],
-)
-
-ci.android_builder(
-    name = "Android arm Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
-        category = "builder|arm",
-        short_name = "32",
-    ),
-    execution_timeout = 4 * time.hour,
-)
-
-ci.android_builder(
-    name = "Android arm64 Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
-        category = "builder|arm",
-        short_name = "64",
-    ),
-    goma_jobs = goma.jobs.MANY_JOBS_FOR_CI,
-    execution_timeout = 5 * time.hour,
-)
-
-ci.android_builder(
-    name = "Android x64 Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
-        category = "builder|x86",
-        short_name = "64",
-    ),
-    execution_timeout = 4 * time.hour,
-)
-
-ci.android_builder(
-    name = "Android x86 Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
-        category = "builder|x86",
-        short_name = "32",
-    ),
-)
-
-ci.android_builder(
-    name = "Cast Android (dbg)",
-    console_view_entry = ci.console_view_entry(
-        category = "on_cq",
-        short_name = "cst",
-    ),
-)
-
-ci.android_builder(
-    name = "Marshmallow 64 bit Tester",
-    console_view_entry = ci.console_view_entry(
-        category = "tester|phone",
-        short_name = "M",
-    ),
-    triggered_by = [builder_name("Android arm64 Builder (dbg)")],
-)
-
-ci.android_builder(
-    name = "Nougat Phone Tester",
-    console_view_entry = ci.console_view_entry(
-        category = "tester|phone",
-        short_name = "N",
-    ),
-    triggered_by = [builder_name("Android arm64 Builder (dbg)")],
-)
-
-ci.android_builder(
-    name = "Oreo Phone Tester",
-    console_view_entry = ci.console_view_entry(
-        category = "tester|phone",
-        short_name = "O",
-    ),
-    triggered_by = [builder_name("Android arm64 Builder (dbg)")],
-)
-
-ci.android_builder(
-    name = "android-cronet-arm-dbg",
-    console_view_entry = ci.console_view_entry(
-        category = "cronet|arm",
-        short_name = "dbg",
-    ),
-    notifies = ["cronet"],
-)
-
-ci.android_builder(
-    name = "android-cronet-arm-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "cronet|arm",
-        short_name = "rel",
-    ),
-    notifies = ["cronet"],
-)
-
-ci.android_builder(
-    name = "android-cronet-arm-rel-kitkat-tests",
-    console_view_entry = ci.console_view_entry(
-        category = "cronet|test",
-        short_name = "k",
-    ),
-    notifies = ["cronet"],
-    triggered_by = [builder_name("android-cronet-arm-rel")],
-)
-
-ci.android_builder(
-    name = "android-cronet-arm-rel-lollipop-tests",
-    console_view_entry = ci.console_view_entry(
-        category = "cronet|test",
-        short_name = "l",
-    ),
-    notifies = ["cronet"],
-    triggered_by = [builder_name("android-cronet-arm-rel")],
-)
-
-ci.android_builder(
-    name = "android-lollipop-arm-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "on_cq",
-        short_name = "L",
-    ),
-)
-
-ci.android_builder(
-    name = "android-marshmallow-arm64-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "on_cq",
-        short_name = "M",
-    ),
-)
-
-ci.android_builder(
-    name = "android-marshmallow-x86-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "builder_tester|x86",
-        short_name = "M",
-    ),
-)
-
-ci.android_builder(
-    name = "android-nougat-arm64-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "builder_tester|arm64",
-        short_name = "N",
-    ),
-)
-
-ci.android_builder(
-    name = "android-pie-arm64-dbg",
-    console_view_entry = ci.console_view_entry(
-        category = "tester|phone",
-        short_name = "P",
-    ),
-    triggered_by = [builder_name("Android arm64 Builder (dbg)")],
-)
-
-ci.android_builder(
-    name = "android-pie-arm64-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "on_cq",
-        short_name = "P",
-    ),
-)
-
-ci.chromium_builder(
-    name = "android-official",
-    # TODO(https://crbug.com/1072012) Use the default console view and add
-    # main_console_view = settings.main_console_name once the build is green
-    console_view = "chromium.fyi",
-    console_view_entry = ci.console_view_entry(
-        category = "android",
-        short_name = "off",
-    ),
-    cores = 32,
-    # TODO: Change this back down to something reasonable once these builders
-    # have populated their cached by getting through the compile step
-    execution_timeout = 6 * time.hour,
-)
-
-ci.chromium_builder(
-    name = "fuchsia-official",
-    # TODO(https://crbug.com/1072012) Use the default console view and add
-    # main_console_view = settings.main_console_name once the build is green
-    console_view = "chromium.fyi",
-    console_view_entry = ci.console_view_entry(
-        category = "fuchsia",
-        short_name = "off",
-    ),
-    cores = 32,
-    # TODO: Change this back down to something reasonable once these builders
-    # have populated their cached by getting through the compile step
-    execution_timeout = 10 * time.hour,
-)
-
-ci.chromium_builder(
-    name = "linux-official",
-    # TODO(https://crbug.com/1072012) Use the default console view and add
-    # main_console_view = settings.main_console_name once the build is green
-    console_view = "chromium.fyi",
-    console_view_entry = ci.console_view_entry(
-        category = "linux",
-        short_name = "off",
-    ),
-    cores = 32,
-    # TODO: Change this back down to something reasonable once these builders
-    # have populated their cached by getting through the compile step
-    execution_timeout = 10 * time.hour,
-)
-
-ci.chromiumos_builder(
-    name = "chromeos-amd64-generic-dbg",
-    console_view_entry = ci.console_view_entry(
-        category = "simple|debug|x64",
-        short_name = "dbg",
-    ),
-)
-
-ci.chromiumos_builder(
-    name = "chromeos-amd64-generic-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "simple|release|x64",
-        short_name = "rel",
-    ),
-)
-
-ci.chromiumos_builder(
-    name = "chromeos-arm-generic-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "simple|release",
-        short_name = "arm",
-    ),
-)
-
-ci.chromiumos_builder(
-    name = "linux-chromeos-dbg",
-    console_view_entry = ci.console_view_entry(
-        category = "default",
-        short_name = "dbg",
-    ),
-)
-
-ci.chromiumos_builder(
-    name = "linux-chromeos-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "default",
-        short_name = "rel",
-    ),
-)
-
-ci.dawn_linux_builder(
-    name = "Dawn Linux x64 DEPS Builder",
-    console_view_entry = ci.console_view_entry(
-        category = "DEPS|Linux|Builder",
-        short_name = "x64",
-    ),
-)
-
-ci.dawn_thin_tester(
-    name = "Dawn Linux x64 DEPS Release (Intel HD 630)",
-    console_view_entry = ci.console_view_entry(
-        category = "DEPS|Linux|Intel",
-        short_name = "x64",
-    ),
-    triggered_by = [builder_name("Dawn Linux x64 DEPS Builder")],
-)
-
-ci.dawn_thin_tester(
-    name = "Dawn Linux x64 DEPS Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
-        category = "DEPS|Linux|Nvidia",
-        short_name = "x64",
-    ),
-    triggered_by = [builder_name("Dawn Linux x64 DEPS Builder")],
-)
-
-ci.dawn_mac_builder(
-    name = "Dawn Mac x64 DEPS Builder",
-    console_view_entry = ci.console_view_entry(
-        category = "DEPS|Mac|Builder",
-        short_name = "x64",
-    ),
-)
-
-# Note that the Mac testers are all thin Linux VMs, triggering jobs on the
-# physical Mac hardware in the Swarming pool which is why they run on linux
-ci.dawn_thin_tester(
-    name = "Dawn Mac x64 DEPS Release (AMD)",
-    console_view_entry = ci.console_view_entry(
-        category = "DEPS|Mac|AMD",
-        short_name = "x64",
-    ),
-    triggered_by = [builder_name("Dawn Mac x64 DEPS Builder")],
-)
-
-ci.dawn_thin_tester(
-    name = "Dawn Mac x64 DEPS Release (Intel)",
-    console_view_entry = ci.console_view_entry(
-        category = "DEPS|Mac|Intel",
-        short_name = "x64",
-    ),
-    triggered_by = [builder_name("Dawn Mac x64 DEPS Builder")],
-)
-
-ci.dawn_windows_builder(
-    name = "Dawn Win10 x64 DEPS Builder",
-    console_view_entry = ci.console_view_entry(
-        category = "DEPS|Windows|Builder",
-        short_name = "x64",
-    ),
-)
-
-ci.dawn_thin_tester(
-    name = "Dawn Win10 x64 DEPS Release (Intel HD 630)",
-    console_view_entry = ci.console_view_entry(
-        category = "DEPS|Windows|Intel",
-        short_name = "x64",
-    ),
-    triggered_by = [builder_name("Dawn Win10 x64 DEPS Builder")],
-)
-
-ci.dawn_thin_tester(
-    name = "Dawn Win10 x64 DEPS Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
-        category = "DEPS|Windows|Nvidia",
-        short_name = "x64",
-    ),
-    triggered_by = [builder_name("Dawn Win10 x64 DEPS Builder")],
-)
-
-ci.dawn_windows_builder(
-    name = "Dawn Win10 x86 DEPS Builder",
-    console_view_entry = ci.console_view_entry(
-        category = "DEPS|Windows|Builder",
-        short_name = "x86",
-    ),
-)
-
-ci.dawn_thin_tester(
-    name = "Dawn Win10 x86 DEPS Release (Intel HD 630)",
-    console_view_entry = ci.console_view_entry(
-        category = "DEPS|Windows|Intel",
-        short_name = "x86",
-    ),
-    triggered_by = [builder_name("Dawn Win10 x86 DEPS Builder")],
-)
-
-ci.dawn_thin_tester(
-    name = "Dawn Win10 x86 DEPS Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
-        category = "DEPS|Windows|Nvidia",
-        short_name = "x86",
-    ),
-    triggered_by = [builder_name("Dawn Win10 x86 DEPS Builder")],
-)
-
-ci.fyi_builder(
-    name = "VR Linux",
-    console_view_entry = ci.console_view_entry(
-        category = "linux",
-    ),
-)
-
-ci.fyi_ios_builder(
-    name = "ios-simulator-cronet",
-    console_view_entry = ci.console_view_entry(
-        category = "cronet",
-    ),
-    fully_qualified_builder_dimension = True,
-    executable = "recipe:chromium",
-    notifies = ["cronet"],
-    properties = {
-        "xcode_build_version": "11e146",
-    },
-)
-
-ci.gpu_linux_builder(
-    name = "Android Release (Nexus 5X)",
-    console_view_entry = ci.console_view_entry(
-        category = "Android",
-    ),
-)
-
-ci.gpu_linux_builder(
-    name = "GPU Linux Builder",
-    console_view_entry = ci.console_view_entry(
-        category = "Linux",
-    ),
-)
-
-ci.gpu_mac_builder(
-    name = "GPU Mac Builder",
-    console_view_entry = ci.console_view_entry(
-        category = "Mac",
-    ),
-)
-
-ci.gpu_windows_builder(
-    name = "GPU Win x64 Builder",
-    console_view_entry = ci.console_view_entry(
-        category = "Windows",
-    ),
-)
-
-ci.gpu_thin_tester(
-    name = "Linux Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
-        category = "Linux",
-    ),
-    triggered_by = [builder_name("GPU Linux Builder")],
-)
-
-ci.gpu_thin_tester(
-    name = "Mac Release (Intel)",
-    console_view_entry = ci.console_view_entry(
-        category = "Mac",
-    ),
-    triggered_by = [builder_name("GPU Mac Builder")],
-)
-
-ci.gpu_thin_tester(
-    name = "Mac Retina Release (AMD)",
-    console_view_entry = ci.console_view_entry(
-        category = "Mac",
-    ),
-    triggered_by = [builder_name("GPU Mac Builder")],
-)
-
-ci.gpu_thin_tester(
-    name = "Win10 x64 Release (NVIDIA)",
-    console_view_entry = ci.console_view_entry(
-        category = "Windows",
-    ),
-    triggered_by = [builder_name("GPU Win x64 Builder")],
-)
-
-ci.linux_builder(
-    name = "Cast Linux",
-    console_view_entry = ci.console_view_entry(
-        category = "cast",
-        short_name = "vid",
-    ),
-    goma_jobs = goma.jobs.J50,
-)
-
-ci.linux_builder(
-    name = "Fuchsia ARM64",
-    console_view_entry = ci.console_view_entry(
-        category = "fuchsia|a64",
-        short_name = "rel",
-    ),
-    extra_notifies = ["cr-fuchsia"],
-)
-
-ci.linux_builder(
-    name = "Fuchsia x64",
-    console_view_entry = ci.console_view_entry(
-        category = "fuchsia|x64",
-        short_name = "rel",
-    ),
-    extra_notifies = ["cr-fuchsia"],
-)
-
-ci.linux_builder(
-    name = "Linux Builder",
-    console_view_entry = ci.console_view_entry(
-        category = "release",
-        short_name = "bld",
-    ),
-)
-
-ci.linux_builder(
-    name = "Linux Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
-        category = "debug|builder",
-        short_name = "64",
-    ),
-)
-
-ci.linux_builder(
-    name = "Linux Tests",
-    console_view_entry = ci.console_view_entry(
-        category = "release",
-        short_name = "tst",
-    ),
-    goma_backend = None,
-    triggered_by = [builder_name("Linux Builder")],
-)
-
-ci.linux_builder(
-    name = "Linux Tests (dbg)(1)",
-    console_view_entry = ci.console_view_entry(
-        category = "debug|tester",
-        short_name = "64",
-    ),
-    triggered_by = [builder_name("Linux Builder (dbg)")],
-)
-
-ci.linux_builder(
-    name = "fuchsia-arm64-cast",
-    console_view_entry = ci.console_view_entry(
-        category = "fuchsia|cast",
-        short_name = "a64",
-    ),
-    extra_notifies = ["cr-fuchsia"],
-)
-
-ci.linux_builder(
-    name = "fuchsia-x64-cast",
-    console_view_entry = ci.console_view_entry(
-        category = "fuchsia|cast",
-        short_name = "x64",
-    ),
-    extra_notifies = ["cr-fuchsia"],
-)
-
-ci.linux_builder(
-    name = "linux-ozone-rel",
-    console_view_entry = ci.console_view_entry(
-        category = "release",
-        short_name = "ozo",
-    ),
-)
-
-ci.linux_builder(
-    name = "Linux Ozone Tester (Headless)",
-    console_view = "chromium.fyi",
-    console_view_entry = ci.console_view_entry(
-        category = "linux",
-        short_name = "loh",
-    ),
-    triggered_by = [builder_name("linux-ozone-rel")],
-)
-
-ci.linux_builder(
-    name = "Linux Ozone Tester (Wayland)",
-    console_view = "chromium.fyi",
-    console_view_entry = ci.console_view_entry(
-        category = "linux",
-        short_name = "low",
-    ),
-    triggered_by = [builder_name("linux-ozone-rel")],
-)
-
-ci.linux_builder(
-    name = "Linux Ozone Tester (X11)",
-    console_view = "chromium.fyi",
-    console_view_entry = ci.console_view_entry(
-        category = "linux",
-        short_name = "lox",
-    ),
-    triggered_by = [builder_name("linux-ozone-rel")],
-)
-
-ci.mac_builder(
-    name = "Mac Builder",
-    console_view_entry = ci.console_view_entry(
-        category = "release",
-        short_name = "bld",
-    ),
-    os = os.MAC_10_15,
-)
-
-ci.mac_builder(
-    name = "Mac Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
-        category = "debug",
-        short_name = "bld",
-    ),
-    os = os.MAC_ANY,
-)
-
-ci.thin_tester(
-    name = "Mac10.10 Tests",
-    builder_group = "chromium.mac",
-    console_view_entry = ci.console_view_entry(
-        category = "release",
-        short_name = "10",
-    ),
-    triggered_by = [builder_name("Mac Builder")],
-)
-
-ci.thin_tester(
-    name = "Mac10.11 Tests",
-    builder_group = "chromium.mac",
-    console_view_entry = ci.console_view_entry(
-        category = "release",
-        short_name = "11",
-    ),
-    triggered_by = [builder_name("Mac Builder")],
-)
-
-ci.thin_tester(
-    name = "Mac10.12 Tests",
-    builder_group = "chromium.mac",
-    console_view_entry = ci.console_view_entry(
-        category = "release",
-        short_name = "12",
-    ),
-    triggered_by = [builder_name("Mac Builder")],
-)
-
-ci.thin_tester(
-    name = "Mac10.13 Tests",
-    builder_group = "chromium.mac",
-    console_view_entry = ci.console_view_entry(
-        category = "release",
-        short_name = "13",
-    ),
-    triggered_by = [builder_name("Mac Builder")],
-)
-
-ci.thin_tester(
-    name = "Mac10.14 Tests",
-    builder_group = "chromium.mac",
-    console_view_entry = ci.console_view_entry(
-        category = "release",
-        short_name = "14",
-    ),
-    triggered_by = [builder_name("Mac Builder")],
-)
-
-ci.thin_tester(
-    name = "Mac10.15 Tests",
-    builder_group = "chromium.mac",
-    console_view_entry = ci.console_view_entry(
-        category = "release",
-        short_name = "15",
-    ),
-    triggered_by = [builder_name("Mac Builder")],
-)
-
-ci.thin_tester(
-    name = "Mac10.13 Tests (dbg)",
-    builder_group = "chromium.mac",
-    console_view_entry = ci.console_view_entry(
-        category = "debug",
-        short_name = "13",
-    ),
-    triggered_by = [builder_name("Mac Builder (dbg)")],
-)
-
-ci.mac_ios_builder(
-    name = "ios-simulator",
-    console_view_entry = ci.console_view_entry(
-        category = "ios|default",
-        short_name = "sim",
-    ),
-    fully_qualified_builder_dimension = True,
-    properties = {
-        "xcode_build_version": "11e146",
-    },
-)
-
-ci.mac_ios_builder(
-    name = "ios-simulator-full-configs",
-    console_view_entry = ci.console_view_entry(
-        category = "ios|default",
-        short_name = "ful",
-    ),
-    fully_qualified_builder_dimension = True,
-    properties = {
-        "xcode_build_version": "11e146",
-    },
-)
-
-ci.memory_builder(
-    name = "Linux ASan LSan Builder",
-    console_view_entry = ci.console_view_entry(
-        category = "linux|asan lsan",
-        short_name = "bld",
-    ),
-    ssd = True,
-)
-
-ci.memory_builder(
-    name = "Linux ASan LSan Tests (1)",
-    console_view_entry = ci.console_view_entry(
-        category = "linux|asan lsan",
-        short_name = "tst",
-    ),
-    triggered_by = [builder_name("Linux ASan LSan Builder")],
-)
-
-ci.memory_builder(
-    name = "Linux ASan Tests (sandboxed)",
-    console_view_entry = ci.console_view_entry(
-        category = "linux|asan lsan",
-        short_name = "sbx",
-    ),
-    triggered_by = [builder_name("Linux ASan LSan Builder")],
-)
-
-ci.memory_builder(
-    name = "Linux TSan Builder",
-    console_view_entry = ci.console_view_entry(
-        category = "linux|TSan v2",
-        short_name = "bld",
-    ),
-)
-
-ci.memory_builder(
-    name = "Linux TSan Tests",
-    console_view_entry = ci.console_view_entry(
-        category = "linux|TSan v2",
-        short_name = "tst",
-    ),
-    triggered_by = [builder_name("Linux TSan Builder")],
-)
-
-ci.win_builder(
-    name = "Win7 Tests (dbg)(1)",
-    console_view_entry = ci.console_view_entry(
-        category = "debug|tester",
-        short_name = "7",
-    ),
-    os = os.WINDOWS_7,
-    triggered_by = [builder_name("Win Builder (dbg)")],
-)
-
-ci.win_builder(
-    name = "Win 7 Tests x64 (1)",
-    console_view_entry = ci.console_view_entry(
-        category = "release|tester",
-        short_name = "64",
-    ),
-    os = os.WINDOWS_7,
-    triggered_by = [builder_name("Win x64 Builder")],
-)
-
-ci.win_builder(
-    name = "Win Builder (dbg)",
-    console_view_entry = ci.console_view_entry(
-        category = "debug|builder",
-        short_name = "32",
-    ),
-    cores = 32,
-    os = os.WINDOWS_ANY,
-)
-
-ci.win_builder(
-    name = "Win x64 Builder",
-    console_view_entry = ci.console_view_entry(
-        category = "release|builder",
-        short_name = "64",
-    ),
-    cores = 32,
-    os = os.WINDOWS_ANY,
-)
-
-ci.win_builder(
-    name = "Win10 Tests x64",
-    console_view_entry = ci.console_view_entry(
-        category = "release|tester",
-        short_name = "w10",
-    ),
-    triggered_by = [builder_name("Win x64 Builder")],
-)
diff --git a/chromium/infra/config/subprojects/chromium/versioned/m85/buckets/try.star b/chromium/infra/config/subprojects/chromium/versioned/m85/buckets/try.star
deleted file mode 100644
index dfa6346c6ad..00000000000
--- a/chromium/infra/config/subprojects/chromium/versioned/m85/buckets/try.star
+++ /dev/null
@@ -1,655 +0,0 @@
-# Copyright 2020 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", "goma", "os")
-load("//lib/try.star", "try_")
-
-# Load this using relative path so that the load statement doesn't
-# need to be changed when making a new milestone
-load("../vars.star", "vars")
-
-try_.declare_bucket(vars)
-
-try_.set_defaults(
-    vars,
-    main_list_view = vars.main_list_view_name,
-)
-
-# Builders are sorted first lexicographically by the function used to define
-# them, then lexicographically by their name
-
-try_.blink_builder(
-    name = "linux-blink-rel",
-    goma_backend = goma.backend.RBE_PROD,
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/cc/.+",
-            ".+/[+]/third_party/blink/renderer/core/paint/.+",
-            ".+/[+]/third_party/blink/renderer/core/svg/.+",
-            ".+/[+]/third_party/blink/renderer/platform/graphics/.+",
-        ],
-    ),
-)
-
-try_.chromium_builder(
-    name = "android-official",
-)
-
-try_.chromium_builder(
-    name = "fuchsia-official",
-)
-
-try_.chromium_builder(
-    name = "linux-official",
-)
-
-try_.chromium_android_builder(
-    name = "android-binary-size",
-    executable = "recipe:binary_size_trybot",
-    goma_jobs = goma.jobs.J150,
-    properties = {
-        "$build/binary_size": {
-            "analyze_targets": [
-                "//chrome/android:validate_expectations",
-                "//chrome/android:monochrome_public_minimal_apks",
-                "//tools/binary_size:binary_size_trybot_py",
-            ],
-            "compile_targets": [
-                "monochrome_public_minimal_apks",
-                "monochrome_static_initializers",
-                "validate_expectations",
-            ],
-        },
-    },
-    tryjob = try_.job(),
-)
-
-try_.chromium_android_builder(
-    name = "android-cronet-arm-dbg",
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/components/cronet/.+",
-            ".+/[+]/components/grpc_support/.+",
-            ".+/[+]/build/android/.+",
-            ".+/[+]/build/config/android/.+",
-        ],
-        location_regexp_exclude = [
-            ".+/[+]/components/cronet/ios/.+",
-        ],
-    ),
-)
-
-try_.chromium_android_builder(
-    name = "android-lollipop-arm-rel",
-    goma_jobs = goma.jobs.J150,
-    tryjob = try_.job(),
-)
-
-try_.chromium_android_builder(
-    name = "android-marshmallow-arm64-rel",
-    cores = 16,
-    goma_jobs = goma.jobs.J300,
-    ssd = True,
-    use_java_coverage = True,
-    tryjob = try_.job(),
-)
-
-try_.chromium_android_builder(
-    name = "android-marshmallow-x86-rel",
-    goma_jobs = goma.jobs.J150,
-)
-
-# TODO(crbug.com/1111436) Added it back once all Pixel 1s are flashed
-# back to NJH47F
-#try_.chromium_android_builder(
-#    name = "android-nougat-arm64-rel",
-#    goma_jobs = goma.jobs.J150,
-#)
-
-try_.chromium_android_builder(
-    name = "android-pie-arm64-dbg",
-    goma_jobs = goma.jobs.J300,
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/chrome/android/features/vr/.+",
-            ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+",
-            ".+/[+]/chrome/android/javatests/src/org/chromium/chrome/browser/vr/.+",
-            ".+/[+]/chrome/browser/vr/.+",
-            ".+/[+]/content/browser/xr/.+",
-            ".+/[+]/third_party/gvr-android-sdk/.+",
-            ".+/[+]/third_party/arcore-android-sdk/.+",
-            ".+/[+]/third_party/arcore-android-sdk-client/.+",
-        ],
-    ),
-)
-
-try_.chromium_android_builder(
-    name = "android-pie-arm64-rel",
-    cores = 16,
-    goma_jobs = goma.jobs.J300,
-    ssd = True,
-    # TODO(crbug.com/1111436): Enable on CQ once the maintenance for
-    # Pixel 2 devices are finished.
-    #tryjob = try_.job(),
-)
-
-try_.chromium_android_builder(
-    name = "android_compile_dbg",
-    goma_jobs = goma.jobs.J150,
-    tryjob = try_.job(),
-)
-
-try_.chromium_android_builder(
-    name = "android_compile_x64_dbg",
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+",
-            ".+/[+]/chrome/browser/vr/.+",
-            ".+/[+]/content/browser/xr/.+",
-            ".+/[+]/sandbox/linux/seccomp-bpf/.+",
-            ".+/[+]/sandbox/linux/seccomp-bpf-helpers/.+",
-            ".+/[+]/sandbox/linux/system_headers/.+",
-            ".+/[+]/sandbox/linux/tests/.+",
-            ".+/[+]/third_party/gvr-android-sdk/.+",
-        ],
-    ),
-)
-
-try_.chromium_android_builder(
-    name = "android_compile_x86_dbg",
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+",
-            ".+/[+]/chrome/browser/vr/.+",
-            ".+/[+]/content/browser/xr/.+",
-            ".+/[+]/sandbox/linux/seccomp-bpf/.+",
-            ".+/[+]/sandbox/linux/seccomp-bpf-helpers/.+",
-            ".+/[+]/sandbox/linux/system_headers/.+",
-            ".+/[+]/sandbox/linux/tests/.+",
-            ".+/[+]/third_party/gvr-android-sdk/.+",
-        ],
-    ),
-)
-
-try_.chromium_android_builder(
-    name = "android_cronet",
-    tryjob = try_.job(),
-)
-
-try_.chromium_android_builder(
-    name = "cast_shell_android",
-    tryjob = try_.job(),
-)
-
-try_.chromium_chromiumos_builder(
-    name = "chromeos-amd64-generic-dbg",
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/content/gpu/.+",
-            ".+/[+]/media/.+",
-        ],
-    ),
-)
-
-try_.chromium_chromiumos_builder(
-    name = "chromeos-amd64-generic-rel",
-    tryjob = try_.job(),
-)
-
-try_.chromium_chromiumos_builder(
-    name = "chromeos-arm-generic-rel",
-    tryjob = try_.job(),
-)
-
-try_.chromium_chromiumos_builder(
-    name = "linux-chromeos-compile-dbg",
-    tryjob = try_.job(),
-)
-
-try_.chromium_chromiumos_builder(
-    name = "linux-chromeos-rel",
-    goma_jobs = goma.jobs.J150,
-    tryjob = try_.job(cancel_stale = False),
-    use_clang_coverage = True,
-)
-
-try_.chromium_dawn_builder(
-    name = "dawn-linux-x64-deps-rel",
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/gpu/.+",
-            ".+/[+]/testing/buildbot/chromium.dawn.json",
-            ".+/[+]/third_party/blink/renderer/modules/webgpu/.+",
-            ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+",
-            ".+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+",
-            ".+/[+]/third_party/blink/web_tests/WebGPUExpectations",
-            ".+/[+]/third_party/dawn/.+",
-            ".+/[+]/tools/clang/scripts/update.py",
-            ".+/[+]/ui/gl/features.gni",
-        ],
-    ),
-)
-
-try_.chromium_dawn_builder(
-    name = "dawn-mac-x64-deps-rel",
-    os = os.MAC_ANY,
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/gpu/.+",
-            ".+/[+]/testing/buildbot/chromium.dawn.json",
-            ".+/[+]/third_party/blink/renderer/modules/webgpu/.+",
-            ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+",
-            ".+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+",
-            ".+/[+]/third_party/blink/web_tests/WebGPUExpectations",
-            ".+/[+]/third_party/dawn/.+",
-            ".+/[+]/tools/clang/scripts/update.py",
-            ".+/[+]/ui/gl/features.gni",
-        ],
-    ),
-)
-
-try_.chromium_dawn_builder(
-    name = "dawn-win10-x64-deps-rel",
-    os = os.WINDOWS_ANY,
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/gpu/.+",
-            ".+/[+]/testing/buildbot/chromium.dawn.json",
-            ".+/[+]/third_party/blink/renderer/modules/webgpu/.+",
-            ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+",
-            ".+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+",
-            ".+/[+]/third_party/blink/web_tests/WebGPUExpectations",
-            ".+/[+]/third_party/dawn/.+",
-            ".+/[+]/tools/clang/scripts/update.py",
-            ".+/[+]/ui/gl/features.gni",
-        ],
-    ),
-)
-
-try_.chromium_dawn_builder(
-    name = "dawn-win10-x86-deps-rel",
-    os = os.WINDOWS_ANY,
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/gpu/.+",
-            ".+/[+]/testing/buildbot/chromium.dawn.json",
-            ".+/[+]/third_party/blink/renderer/modules/webgpu/.+",
-            ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+",
-            ".+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+",
-            ".+/[+]/third_party/blink/web_tests/WebGPUExpectations",
-            ".+/[+]/third_party/dawn/.+",
-            ".+/[+]/tools/clang/scripts/update.py",
-            ".+/[+]/ui/gl/features.gni",
-        ],
-    ),
-)
-
-try_.chromium_linux_builder(
-    name = "cast_shell_linux",
-    tryjob = try_.job(),
-)
-
-try_.chromium_linux_builder(
-    name = "closure_compilation",
-    executable = "recipe:closure_compilation",
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/third_party/closure_compiler/.+",
-        ],
-    ),
-)
-
-try_.chromium_linux_builder(
-    name = "chromium_presubmit",
-    executable = "recipe:presubmit",
-    goma_backend = None,
-    properties = {
-        "$depot_tools/presubmit": {
-            "runhooks": True,
-            "timeout_s": 480,
-        },
-        "repo_name": "chromium",
-    },
-    tryjob = try_.job(
-        disable_reuse = True,
-        add_default_excludes = False,
-    ),
-)
-
-try_.chromium_linux_builder(
-    name = "fuchsia-arm64-cast",
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/chromecast/.+",
-        ],
-    ),
-)
-
-try_.chromium_linux_builder(
-    name = "fuchsia-x64-cast",
-    tryjob = try_.job(),
-)
-
-# The fuchsia_arm64 builder will now run tests as well as compiles.
-# The experiment percentage is used to ramp up the test load while
-# monitoring stability and capacity.  crbug.com/1042511
-try_.chromium_linux_builder(
-    name = "fuchsia_arm64",
-    tryjob = try_.job(
-        experiment_percentage = 50,
-    ),
-)
-
-try_.chromium_linux_builder(
-    name = "fuchsia_x64",
-    tryjob = try_.job(),
-)
-
-try_.chromium_linux_builder(
-    name = "linux-libfuzzer-asan-rel",
-    executable = "recipe:chromium_libfuzzer_trybot",
-    tryjob = try_.job(),
-)
-
-try_.chromium_linux_builder(
-    name = "linux-ozone-rel",
-    tryjob = try_.job(),
-)
-
-try_.chromium_linux_builder(
-    name = "linux-rel",
-    goma_jobs = goma.jobs.J150,
-    tryjob = try_.job(),
-    use_clang_coverage = True,
-)
-
-try_.chromium_linux_builder(
-    name = "linux_chromium_asan_rel_ng",
-    goma_jobs = goma.jobs.J150,
-    ssd = True,
-    tryjob = try_.job(),
-)
-
-try_.chromium_linux_builder(
-    name = "linux_chromium_compile_dbg_ng",
-    caches = [
-        swarming.cache(
-            name = "builder",
-            path = "linux_debug",
-        ),
-    ],
-    goma_jobs = goma.jobs.J150,
-    tryjob = try_.job(),
-)
-
-try_.chromium_linux_builder(
-    name = "linux_chromium_dbg_ng",
-    caches = [
-        swarming.cache(
-            name = "builder",
-            path = "linux_debug",
-        ),
-    ],
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/build/.*check_gn_headers.*",
-        ],
-    ),
-)
-
-try_.chromium_linux_builder(
-    name = "linux_chromium_tsan_rel_ng",
-    goma_jobs = goma.jobs.J150,
-    tryjob = try_.job(),
-)
-
-try_.chromium_linux_builder(
-    name = "linux_layout_tests_composite_after_paint",
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/third_party/blink/renderer/core/paint/.+",
-            ".+/[+]/third_party/blink/renderer/core/svg/.+",
-            ".+/[+]/third_party/blink/renderer/platform/graphics/.+",
-            ".+/[+]/third_party/blink/web_tests/.+",
-        ],
-    ),
-)
-
-try_.chromium_linux_builder(
-    name = "linux_layout_tests_layout_ng_disabled",
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/third_party/blink/renderer/core/editing/.+",
-            ".+/[+]/third_party/blink/renderer/core/layout/.+",
-            ".+/[+]/third_party/blink/renderer/core/paint/.+",
-            ".+/[+]/third_party/blink/renderer/core/svg/.+",
-            ".+/[+]/third_party/blink/renderer/platform/fonts/shaping/.+",
-            ".+/[+]/third_party/blink/renderer/platform/graphics/.+",
-            ".+/[+]/third_party/blink/web_tests/FlagExpectations/disable-layout-ng",
-            ".+/[+]/third_party/blink/web_tests/flag-specific/disable-layout-ng/.+",
-        ],
-    ),
-)
-
-try_.chromium_linux_builder(
-    name = "linux_vr",
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/chrome/browser/vr/.+",
-            ".+/[+]/content/browser/xr/.+",
-        ],
-    ),
-)
-
-try_.chromium_mac_builder(
-    name = "mac-rel",
-    goma_jobs = goma.jobs.J150,
-    os = os.MAC_DEFAULT,
-    tryjob = try_.job(),
-)
-
-try_.chromium_mac_builder(
-    name = "mac_chromium_compile_dbg_ng",
-    goma_jobs = goma.jobs.J150,
-    os = os.MAC_DEFAULT,
-    tryjob = try_.job(),
-)
-
-try_.chromium_mac_ios_builder(
-    name = "ios-simulator",
-    executable = "recipe:chromium_trybot",
-    fully_qualified_builder_dimension = True,
-    properties = {
-        "xcode_build_version": "11e146",
-    },
-    tryjob = try_.job(),
-)
-
-try_.chromium_mac_ios_builder(
-    name = "ios-simulator-cronet",
-    executable = "recipe:chromium_trybot",
-    fully_qualified_builder_dimension = True,
-    properties = {
-        "xcode_build_version": "11e146",
-    },
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/components/cronet/.+",
-            ".+/[+]/components/grpc_support/.+",
-            ".+/[+]/ios/.+",
-        ],
-        location_regexp_exclude = [
-            ".+/[+]/components/cronet/android/.+",
-        ],
-    ),
-)
-
-try_.chromium_mac_ios_builder(
-    name = "ios-simulator-full-configs",
-    executable = "recipe:chromium_trybot",
-    fully_qualified_builder_dimension = True,
-    properties = {
-        "xcode_build_version": "11e146",
-    },
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/ios/.+",
-        ],
-    ),
-)
-
-try_.chromium_win_builder(
-    name = "win-libfuzzer-asan-rel",
-    builderless = False,
-    executable = "recipe:chromium_libfuzzer_trybot",
-    os = os.WINDOWS_ANY,
-    tryjob = try_.job(cancel_stale = False),
-)
-
-try_.chromium_win_builder(
-    name = "win_chromium_compile_dbg_ng",
-    goma_jobs = goma.jobs.J150,
-    tryjob = try_.job(cancel_stale = False),
-)
-
-try_.chromium_win_builder(
-    name = "win10_chromium_x64_rel_ng",
-    goma_jobs = goma.jobs.J150,
-    os = os.WINDOWS_10,
-    ssd = True,
-    use_clang_coverage = True,
-    tryjob = try_.job(cancel_stale = False),
-)
-
-try_.gpu_chromium_android_builder(
-    name = "android_optional_gpu_tests_rel",
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/cc/.+",
-            ".+/[+]/chrome/browser/vr/.+",
-            ".+/[+]/content/browser/xr/.+",
-            ".+/[+]/components/viz/.+",
-            ".+/[+]/content/test/gpu/.+",
-            ".+/[+]/gpu/.+",
-            ".+/[+]/media/audio/.+",
-            ".+/[+]/media/filters/.+",
-            ".+/[+]/media/gpu/.+",
-            ".+/[+]/services/viz/.+",
-            ".+/[+]/testing/trigger_scripts/.+",
-            ".+/[+]/third_party/blink/renderer/modules/webgl/.+",
-            ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+",
-            ".+/[+]/tools/clang/scripts/update.py",
-            ".+/[+]/ui/gl/.+",
-        ],
-    ),
-)
-
-try_.gpu_chromium_linux_builder(
-    name = "linux_optional_gpu_tests_rel",
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/chrome/browser/vr/.+",
-            ".+/[+]/content/browser/xr/.+",
-            ".+/[+]/content/test/gpu/.+",
-            ".+/[+]/gpu/.+",
-            ".+/[+]/media/audio/.+",
-            ".+/[+]/media/filters/.+",
-            ".+/[+]/media/gpu/.+",
-            ".+/[+]/testing/buildbot/chromium.gpu.fyi.json",
-            ".+/[+]/testing/trigger_scripts/.+",
-            ".+/[+]/third_party/blink/renderer/modules/webgl/.+",
-            ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+",
-            ".+/[+]/tools/clang/scripts/update.py",
-            ".+/[+]/ui/gl/.+",
-        ],
-    ),
-)
-
-try_.gpu_chromium_mac_builder(
-    name = "mac_optional_gpu_tests_rel",
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/chrome/browser/vr/.+",
-            ".+/[+]/content/browser/xr/.+",
-            ".+/[+]/content/test/gpu/.+",
-            ".+/[+]/gpu/.+",
-            ".+/[+]/media/audio/.+",
-            ".+/[+]/media/filters/.+",
-            ".+/[+]/media/gpu/.+",
-            ".+/[+]/services/shape_detection/.+",
-            ".+/[+]/testing/buildbot/chromium.gpu.fyi.json",
-            ".+/[+]/testing/trigger_scripts/.+",
-            ".+/[+]/third_party/blink/renderer/modules/webgl/.+",
-            ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+",
-            ".+/[+]/tools/clang/scripts/update.py",
-            ".+/[+]/ui/gl/.+",
-        ],
-    ),
-)
-
-try_.gpu_chromium_win_builder(
-    name = "win_optional_gpu_tests_rel",
-    builderless = True,
-    os = os.WINDOWS_DEFAULT,
-    tryjob = try_.job(
-        location_regexp = [
-            ".+/[+]/chrome/browser/vr/.+",
-            ".+/[+]/content/browser/xr/.+",
-            ".+/[+]/content/test/gpu/.+",
-            ".+/[+]/device/vr/.+",
-            ".+/[+]/gpu/.+",
-            ".+/[+]/media/audio/.+",
-            ".+/[+]/media/filters/.+",
-            ".+/[+]/media/gpu/.+",
-            ".+/[+]/testing/buildbot/chromium.gpu.fyi.json",
-            ".+/[+]/testing/trigger_scripts/.+",
-            ".+/[+]/third_party/blink/renderer/modules/vr/.+",
-            ".+/[+]/third_party/blink/renderer/modules/webgl/.+",
-            ".+/[+]/third_party/blink/renderer/modules/xr/.+",
-            ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+",
-            ".+/[+]/tools/clang/scripts/update.py",
-            ".+/[+]/ui/gl/.+",
-        ],
-    ),
-)
-
-# 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.
-def chrome_internal_verifier(
-        *,
-        builder):
-    luci.cq_tryjob_verifier(
-        builder = "chrome:try/" + builder,
-        cq_group = vars.cq_group,
-        includable_only = True,
-        owner_whitelist = [
-            "googlers",
-            "project-chromium-robot-committers",
-        ],
-    )
-
-chrome_internal_verifier(
-    builder = "mac-chrome-beta",
-)
-
-chrome_internal_verifier(
-    builder = "mac-chrome-stable",
-)
-
-chrome_internal_verifier(
-    builder = "win-chrome-beta",
-)
-
-chrome_internal_verifier(
-    builder = "win-chrome-stable",
-)
-
-chrome_internal_verifier(
-    builder = "win64-chrome-beta",
-)
-
-chrome_internal_verifier(
-    builder = "win64-chrome-stable",
-)
diff --git a/chromium/infra/config/subprojects/chromium/versioned/m85/vars.star b/chromium/infra/config/subprojects/chromium/versioned/m85/vars.star
deleted file mode 100644
index 153c0b888a2..00000000000
--- a/chromium/infra/config/subprojects/chromium/versioned/m85/vars.star
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2020 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.
-
-vars = struct(
-    is_master = False,
-    ref = "refs/branch-heads/4183",
-    ci_bucket = "ci-m85",
-    ci_poller = "m85-gitiles-trigger",
-    main_console_name = "main-m85",
-    main_console_title = "Chromium M85 Console",
-    cq_mirrors_console_name = "mirrors-m85",
-    cq_mirrors_console_title = "Chromium M85 CQ Mirrors Console",
-    try_bucket = "try-m85",
-    try_triggering_projects = [],
-    cq_group = "cq-m85",
-    cq_ref_regexp = "refs/branch-heads/4183",
-    main_list_view_name = "try-m85",
-    main_list_view_title = "Chromium M85 CQ console",
-    tree_status_host = None,
-)
diff --git a/chromium/infra/config/subprojects/codesearch/codesearch.star b/chromium/infra/config/subprojects/codesearch/codesearch.star
index b620e67c09c..66f9c047dcc 100644
--- a/chromium/infra/config/subprojects/codesearch/codesearch.star
+++ b/chromium/infra/config/subprojects/codesearch/codesearch.star
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 load("//lib/builders.star", "cpu", "goma", "os")
+load("//lib/consoles.star", "consoles")
 load("//lib/try.star", "try_")
 
 luci.bucket(
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 9ace3a66516..f1588cee5a5 100644
--- a/chromium/infra/config/subprojects/goma/consoles/chromium.goma.fyi.star
+++ b/chromium/infra/config/subprojects/goma/consoles/chromium.goma.fyi.star
@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+load("//console-header.star", "HEADER")
+
 luci.console_view(
     name = "chromium.goma.fyi",
-    header = "//chromium-header.textpb",
+    header = HEADER,
     include_experimental_builds = True,
     repo = "https://chromium.googlesource.com/chromium/src",
     entries = [
diff --git a/chromium/infra/config/subprojects/goma/consoles/chromium.goma.star b/chromium/infra/config/subprojects/goma/consoles/chromium.goma.star
index 8c03e4f86ff..5cdd0cdd6a8 100644
--- a/chromium/infra/config/subprojects/goma/consoles/chromium.goma.star
+++ b/chromium/infra/config/subprojects/goma/consoles/chromium.goma.star
@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+load("//console-header.star", "HEADER")
+
 luci.console_view(
     name = "chromium.goma",
-    header = "//chromium-header.textpb",
+    header = HEADER,
     include_experimental_builds = True,
     repo = "https://chromium.googlesource.com/chromium/src",
     entries = [
diff --git a/chromium/infra/config/subprojects/goma/consoles/goma.latest.star b/chromium/infra/config/subprojects/goma/consoles/goma.latest.star
index f64d8a00409..4bf267b3079 100644
--- a/chromium/infra/config/subprojects/goma/consoles/goma.latest.star
+++ b/chromium/infra/config/subprojects/goma/consoles/goma.latest.star
@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+load("//console-header.star", "HEADER")
+
 luci.console_view(
     name = "goma.latest",
-    header = "//chromium-header.textpb",
+    header = HEADER,
     repo = "https://chromium.googlesource.com/chromium/src",
     entries = [
         luci.console_view_entry(
diff --git a/chromium/infra/config/subprojects/goma/consoles/luci.chromium.goma.star b/chromium/infra/config/subprojects/goma/consoles/luci.chromium.goma.star
index 4caec56b950..dee42df3335 100644
--- a/chromium/infra/config/subprojects/goma/consoles/luci.chromium.goma.star
+++ b/chromium/infra/config/subprojects/goma/consoles/luci.chromium.goma.star
@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+load("//console-header.star", "HEADER")
+
 luci.console_view(
     name = "luci.chromium.goma",
-    header = "//chromium-header.textpb",
+    header = HEADER,
     include_experimental_builds = True,
     repo = "https://chromium.googlesource.com/chromium/src",
     entries = [
diff --git a/chromium/infra/config/subprojects/goma/goma.star b/chromium/infra/config/subprojects/goma/goma.star
index 1173368a325..83dc774f721 100644
--- a/chromium/infra/config/subprojects/goma/goma.star
+++ b/chromium/infra/config/subprojects/goma/goma.star
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-load("//lib/builders.star", "builder", "cpu", "defaults", "goma", "os", "xcode_cache")
+load("//lib/builders.star", "builder", "cpu", "defaults", "goma", "os", "xcode")
 
 luci.bucket(
     name = "goma",
@@ -35,7 +35,7 @@ defaults.service_account.set(
     "goma-release-testing@chops-service-accounts.iam.gserviceaccount.com",
 )
 defaults.swarming_tags.set(["vpython:native-python-wrapper"])
-defaults.triggered_by.set(["master-gitiles-trigger"])
+defaults.triggered_by.set(["chromium-gitiles-trigger"])
 
 # Builders appear after the function used to define them, with all builders
 # defined using the same function ordered lexicographically by name
@@ -110,12 +110,9 @@ fyi_goma_canary_builder(
 
 fyi_goma_canary_builder(
     name = "ios-device-goma-canary-clobber",
-    caches = [xcode_cache.x12a7209],
     cores = None,
     os = os.MAC_10_15,
-    properties = {
-        "xcode_build_version": "12a7209",
-    },
+    xcode = xcode.x12a7209,
 )
 
 fyi_goma_canary_builder(
@@ -185,12 +182,9 @@ fyi_goma_rbe_canary_builder(
 
 fyi_goma_rbe_canary_builder(
     name = "ios-device-goma-rbe-canary-clobber",
-    caches = [xcode_cache.x12a7209],
     cores = None,
     os = os.MAC_10_15,
-    properties = {
-        "xcode_build_version": "12a7209",
-    },
+    xcode = xcode.x12a7209,
 )
 
 fyi_goma_rbe_canary_builder(
@@ -270,12 +264,9 @@ fyi_goma_latest_client_builder(
 
 fyi_goma_latest_client_builder(
     name = "ios-device-goma-latest-clobber",
-    caches = [xcode_cache.x12a7209],
     cores = None,
     os = os.MAC_10_15,
-    properties = {
-        "xcode_build_version": "12a7209",
-    },
+    xcode = xcode.x12a7209,
 )
 
 fyi_goma_latest_client_builder(
@@ -359,12 +350,9 @@ fyi_goma_rbe_latest_client_builder(
 
 fyi_goma_rbe_latest_client_builder(
     name = "ios-device-goma-rbe-latest-clobber",
-    caches = [xcode_cache.x12a7209],
     cores = None,
     os = os.MAC_10_15,
-    properties = {
-        "xcode_build_version": "12a7209",
-    },
+    xcode = xcode.x12a7209,
 )
 
 fyi_goma_rbe_latest_client_builder(
@@ -477,12 +465,9 @@ def goma_mac_builder(
 
 goma_mac_builder(
     name = "Chromium iOS Goma RBE ToT",
-    caches = [xcode_cache.x12a7209],
     goma_backend = goma.backend.RBE_TOT,
     os = os.MAC_10_15,
-    properties = {
-        "xcode_build_version": "12a7209",
-    },
+    xcode = xcode.x12a7209,
 )
 
 goma_mac_builder(
diff --git a/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.fyi.star b/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.fyi.star
index a5b390c0a3e..cd5f7e3405f 100644
--- a/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.fyi.star
+++ b/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.fyi.star
@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+load("//console-header.star", "HEADER")
+
 luci.console_view(
     name = "chromium.webrtc.fyi",
-    header = "//chromium-header.textpb",
+    header = HEADER,
     repo = "https://webrtc.googlesource.com/src",
     entries = [
         luci.console_view_entry(
diff --git a/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.star b/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.star
index e5d92b63777..dddc5340e78 100644
--- a/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.star
+++ b/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.star
@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+load("//console-header.star", "HEADER")
+
 luci.console_view(
     name = "chromium.webrtc",
-    header = "//chromium-header.textpb",
+    header = HEADER,
     repo = "https://chromium.googlesource.com/chromium/src",
     entries = [
         luci.console_view_entry(
diff --git a/chromium/infra/config/subprojects/webrtc/webrtc.fyi.star b/chromium/infra/config/subprojects/webrtc/webrtc.fyi.star
index 83e32a985e7..d3a38168f21 100644
--- a/chromium/infra/config/subprojects/webrtc/webrtc.fyi.star
+++ b/chromium/infra/config/subprojects/webrtc/webrtc.fyi.star
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-load("//lib/builders.star", "builder", "cpu", "defaults", "goma", "os", "xcode_cache")
+load("//lib/builders.star", "builder", "cpu", "defaults", "goma", "os", "xcode")
 
 luci.bucket(
     name = "webrtc.fyi",
@@ -151,22 +151,16 @@ builder(
 
 builder(
     name = "WebRTC Chromium FYI ios-device",
-    caches = [xcode_cache.x12a7209],
     executable = "recipe:webrtc/chromium_ios",
     goma_backend = goma.backend.RBE_PROD,
     os = os.MAC_ANY,
-    properties = {
-        "xcode_build_version": "12a7209",
-    },
+    xcode = xcode.x12a7209,
 )
 
 builder(
     name = "WebRTC Chromium FYI ios-simulator",
-    caches = [xcode_cache.x12a7209],
     executable = "recipe:webrtc/chromium_ios",
     goma_backend = goma.backend.RBE_PROD,
     os = os.MAC_ANY,
-    properties = {
-        "xcode_build_version": "12a7209",
-    },
+    xcode = xcode.x12a7209,
 )
diff --git a/chromium/infra/config/subprojects/webrtc/webrtc.star b/chromium/infra/config/subprojects/webrtc/webrtc.star
index 00b3ed05660..53ab23c43b7 100644
--- a/chromium/infra/config/subprojects/webrtc/webrtc.star
+++ b/chromium/infra/config/subprojects/webrtc/webrtc.star
@@ -36,7 +36,7 @@ defaults.execution_timeout.set(2 * time.hour)
 defaults.os.set(os.LINUX_DEFAULT)
 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(["master-gitiles-trigger"])
+defaults.triggered_by.set(["chromium-gitiles-trigger"])
 
 defaults.properties.set({
     "perf_dashboard_machine_group": "ChromiumWebRTC",
diff --git a/chromium/infra/config/swarming.star b/chromium/infra/config/swarming.star
index f035bfcc6ba..58ff96a8f06 100644
--- a/chromium/infra/config/swarming.star
+++ b/chromium/infra/config/swarming.star
@@ -8,7 +8,7 @@ They are actually shared with a bunch other projects.
 """
 
 load("//lib/swarming.star", "swarming")
-load("//project.star", "ACTIVE_BRANCHES")
+load("//project.star", "ACTIVE_MILESTONES")
 
 # Set up permissions that apply to all Chromium pools.
 swarming.root_permissions()
@@ -58,7 +58,13 @@ swarming.task_triggerers(
 # projects).
 swarming.pool_realm(
     name = "pools/ci",
-    projects = ["chromium-%s" % m for m, _ in ACTIVE_BRANCHES],
+    projects = [details.project for details in ACTIVE_MILESTONES.values()],
+)
+
+swarming.task_triggerers(
+    builder_realm = "ci",
+    pool_realm = "pools/ci",
+    users = ["chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"],
 )
 
 # Realm with bots that run try builds.
@@ -66,7 +72,7 @@ swarming.pool_realm(
 # The tasks here are also triggered via Buildbucket. See comment above.
 swarming.pool_realm(
     name = "pools/try",
-    projects = ["chromium-%s" % m for m, _ in ACTIVE_BRANCHES],
+    projects = [details.project for details in ACTIVE_MILESTONES.values()],
 )
 
 # LED users that can trigger try builds via LED.
diff --git a/chromium/infra/config/tricium-prod.cfg b/chromium/infra/config/tricium-prod.cfg
index daa23d9a960..1034e632957 100644
--- a/chromium/infra/config/tricium-prod.cfg
+++ b/chromium/infra/config/tricium-prod.cfg
@@ -6,9 +6,6 @@ acls {
   group: "tricium-chromium-requesters"
 }
 
-# Analyzer definitions
-# These are analyzers that are only applicable to this repository.
-
 functions {
   type: ANALYZER
   name: "ClangTidy"
@@ -51,8 +48,8 @@ functions {
   owner: "isherman@chromium.org"
   monorail_component: "Internals>Metrics>Tricium"
   impls {
-    runtime_platform: UBUNTU
-    provides_for_platform: UBUNTU
+    runtime_platform: LINUX
+    provides_for_platform: LINUX
     recipe {
       project: "chromium"
       bucket: "try"
@@ -62,7 +59,25 @@ functions {
   }
 }
 
-# Selections (enabled functions)
+# Wrapper for simple legacy analyzers.
+functions {
+  type: ANALYZER
+  name: "Simple"
+  needs: GIT_FILE_DETAILS
+  provides: RESULTS
+  owner: "qyearsley@chromium.org"
+  monorail_component: "Infra>Platform>Tricium>Analyzer"
+  impls {
+    runtime_platform: LINUX
+    provides_for_platform: LINUX
+    recipe {
+      project: "chromium"
+      bucket: "try"
+      builder: "tricium-simple"
+    }
+    deadline: 900
+  }
+}
 
 selections {
   function: "ClangTidy"
@@ -70,41 +85,13 @@ selections {
 }
 
 selections {
-  function: "GitFileIsolator"
-  platform: UBUNTU
-}
-
-selections {
-  function: "HttpsCheck"
-  platform: UBUNTU
-}
-
-selections {
   function: "Metrics"
-  platform: UBUNTU
-}
-
-selections {
-  function: "MojomCommentator"
-  platform: UBUNTU
-}
-
-selections {
-  function: "Pylint"
-  platform: UBUNTU
-  configs {
-    name: "disable"
-    value: "all"
-  }
-  configs {
-    name: "enable"
-    value: "syntax-error,unused-variable,undefined-variable,unused-import"
-  }
+  platform: LINUX
 }
 
 selections {
-  function: "SpellChecker"
-  platform: UBUNTU
+  function: "Simple"
+  platform: LINUX
 }
 
 repos {