BASELINE: Update Chromium to 77.0.3865.59

Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

10 files changed, 1745 insertions, 764 deletions

diff --git a/chromium/infra/config/OWNERS b/chromium/infra/config/OWNERS
index 31a321e33b5..a966cffd4a7 100644
--- a/chromium/infra/config/OWNERS
+++ b/chromium/infra/config/OWNERS
@@ -1,5 +1,4 @@
 # For build parallelism configs.
-per-file cr-buildbucket.cfg=shinyak@chromium.org
 per-file cr-buildbucket.cfg=sque@chromium.org
 per-file cr-buildbucket.cfg=tikuta@chromium.org
 per-file cr-buildbucket.cfg=ukai@chromium.org
diff --git a/chromium/infra/config/commit-queue.cfg b/chromium/infra/config/commit-queue.cfg
index f4a98d322ff..a314f749374 100644
--- a/chromium/infra/config/commit-queue.cfg
+++ b/chromium/infra/config/commit-queue.cfg
@@ -196,6 +196,7 @@ config_groups {
       builders {
         name: "chromium/try/chromeos-kevin-rel"
         location_regexp: ".+/[+]/build/chromeos/.+"
+        location_regexp: ".+/[+]/build/config/chromeos/.*"
       }
       builders {
         name: "chromium/try/closure_compilation"
@@ -237,6 +238,14 @@ config_groups {
         location_regexp: ".+/[+]/third_party/dawn/.+"
       }
       builders {
+        name: "chromium/try/fuchsia-arm64-cast"
+        location_regexp: ".+/[+]/chromecast/.+"
+      }
+      builders {
+        name: "chromium/try/fuchsia-x64-cast"
+        location_regexp: ".+/[+]/chromecast/.+"
+      }
+      builders {
         name: "chromium/try/ios-simulator-cronet"
         location_regexp: ".+/[+]/components/cronet/.+"
         location_regexp: ".+/[+]/components/grpc_support/.+"
@@ -280,12 +289,6 @@ config_groups {
         location_regexp: ".+/[+]/third_party/blink/web_tests/flag-specific/enable-blink-features=LayoutNG/.+"
       }
       builders {
-        name: "chromium/try/linux_mojo"
-        location_regexp: ".+/[+]/services/network/.+"
-        location_regexp: ".+/[+]/testing/buildbot/filters/mojo\\.fyi\\.network_.*"
-        location_regexp: ".+/[+]/third_party/blink/web_tests/FlagExpectations/enable-features=NetworkService"
-      }
-      builders {
         name: "chromium/try/linux_optional_gpu_tests_rel"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/test/gpu/.+"
@@ -359,11 +362,6 @@ config_groups {
         name: "chromium/try/linux-coverage-rel"
         experiment_percentage: 10
       }
-      # https://crbug.com/855319
-      builders {
-        name: "chromium/try/linux-goma-rbe-staging-rel"
-        experiment_percentage: 40
-      }
       builders {
         name: "chromium/try/win7_chromium_rel_loc_exp"
         experiment_percentage: 20
diff --git a/chromium/infra/config/cq_cfg_presubmit.py b/chromium/infra/config/cq_cfg_presubmit.py
index 38c8ad7ce38..549a5aa616a 100755
--- a/chromium/infra/config/cq_cfg_presubmit.py
+++ b/chromium/infra/config/cq_cfg_presubmit.py
@@ -19,7 +19,7 @@ CHROMIUM_DIR = os.path.abspath(os.path.join(
 MD_HEADER = """# List of CQ builders
 
 This page is auto generated using the script
-//infra/config/cq_config_presubmit.py. Do not manually edit.
+//infra/config/cq_cfg_presubmit.py. Do not manually edit.
 
 [TOC]
 
@@ -283,7 +283,8 @@ def verify_location_regexps(regexps, verbose=True):
   invalid_regexp = False
   for regexp in regexps:
     regexp = regexp.replace('\\\\', '')
-    assert regexp.startswith(REGEX_PREFIX)
+    assert regexp.startswith(REGEX_PREFIX), (
+        'location_regexp "%s" must start with "%s"' % (regexp, REGEX_PREFIX))
     regexp = regexp[len(REGEX_PREFIX):]
     # Split by path name, so that we don't have to run os.walk on the entire
     # source tree. commit-queue.cfg always uses '/' as the path separator.
diff --git a/chromium/infra/config/cr-buildbucket-dev.cfg b/chromium/infra/config/cr-buildbucket-dev.cfg
index 2da7dfc2d56..b8918a041fb 100644
--- a/chromium/infra/config/cr-buildbucket-dev.cfg
+++ b/chromium/infra/config/cr-buildbucket-dev.cfg
@@ -94,6 +94,7 @@ buckets {
       category: "Chromium"
       execution_timeout_secs: 10800  # 3h
       service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
+      swarming_tags: "vpython:native-python-wrapper"
       build_numbers: YES
       recipe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
diff --git a/chromium/infra/config/cr-buildbucket.cfg b/chromium/infra/config/cr-buildbucket.cfg
index b71828e8664..3d517cb9fe9 100644
--- a/chromium/infra/config/cr-buildbucket.cfg
+++ b/chromium/infra/config/cr-buildbucket.cfg
@@ -64,6 +64,11 @@ acl_sets {
     identity: "findit-for-me@appspot.gserviceaccount.com"
   }
   acls {
+    # Allow Pinpoint to trigger builds for bisection.
+    role: SCHEDULER
+    group: "service-account-chromeperf"
+  }
+  acls {
     role: WRITER
     group: "service-account-chromium-tryserver"
   }
@@ -304,6 +309,15 @@ builder_mixins {
     properties_j: "$build/goma:{\"jobs\": 150}"
   }
 }
+# Same as "android-ci" but uses Goma RBE backend.
+builder_mixins {
+  name: "android-ci-goma-rbe-prod"
+  # TODO(tandrii, sque): Migrate to "goma-rbe-prod-many-jobs-for-ci" gradually.
+  recipe {
+    properties: "mastername:chromium.android"
+  }
+  mixins: "goma-rbe-prod-j150"
+}
 
 builder_mixins {
   # We have limited tablet capacity and thus limited ability to run
@@ -321,13 +335,14 @@ builder_mixins {
 
 builder_mixins {
   name: "android-angle-try"
-  dimensions: "os:Ubuntu-14.04"
+  dimensions: "os:Ubuntu-16.04"
   mixins: "angle-try"
 }
 
 builder_mixins {
   name: "android-gpu-ci"
-  dimensions: "os:Ubuntu-14.04"
+  dimensions: "os:Ubuntu-16.04"
+  mixins: "builderless"
   recipe {
     properties: "mastername:chromium.gpu"
   }
@@ -335,14 +350,15 @@ builder_mixins {
 
 builder_mixins {
   name: "android-gpu-fyi-ci"
-  dimensions: "os:Ubuntu-14.04"
+  dimensions: "os:Ubuntu-16.04"
+  mixins: "builderless"
   mixins: "gpu-fyi-ci"
   mixins: "gpu-slow-bot"
 }
 
 builder_mixins {
   name: "android-optional-gpu-try"
-  dimensions: "os:Ubuntu-14.04"
+  dimensions: "os:Ubuntu-16.04"
   mixins: "android-try"
   mixins: "gpu-optional-try"
   mixins: "gpu-slow-bot"
@@ -364,6 +380,34 @@ builder_mixins {
 }
 
 builder_mixins {
+  name: "celab"
+  recipe {
+    name: "celab"
+    # The version of CELab binaries to use for tests (cel_ctl & cel_agent).
+    properties: "celab_version:7R4C-DmIN8lwXvsToDcbG0pgyWcvJT-S-fu15NYkIdEC"
+    # This controls which tests to run (* is all tests).
+    # We might create more builders for different test sets later.
+    properties: "tests:*"
+  }
+}
+builder_mixins {
+  name: "celab-ci"
+  mixins: "celab"
+  recipe {
+    properties: "pool_name:celab-chromium-ci"
+    properties_j: "pool_size:10"
+  }
+}
+builder_mixins {
+  name: "celab-try"
+  mixins: "celab"
+  recipe {
+    properties: "pool_name:celab-chromium-try"
+    properties_j: "pool_size:10"
+  }
+}
+
+builder_mixins {
   name: "clang-ci"
   mixins: "builderless"
   dimensions: "cores:"  # Mac uses 24 cores, Linux/Win uses 32 cores.
@@ -390,6 +434,7 @@ builder_mixins {
   mixins: "clang-ci"
   mixins: "mac"
   dimensions: "cores:24"
+  dimensions: "ssd:1"
 }
 
 builder_mixins {
@@ -407,13 +452,6 @@ builder_mixins {
 }
 
 builder_mixins {
-  name: "chromedriver-ci"
-  recipe {
-    properties: "mastername:chromium.chromedriver"
-  }
-}
-
-builder_mixins {
   name: "chromeos-ci"
   # All CrOS building is done via cross-compilation on linux hosts, so use the
   # linux mixin.
@@ -456,12 +494,6 @@ builder_mixins {
   recipe {
     properties: "mastername:chromium.dawn"
   }
-  # Remove the cores dimensions for this mixin so that VMs of differing sizes
-  # can be used.
-  # This works here only because we use auto_builder_dimensions,
-  # so that only the bots that were earmarked for the builders
-  # will be allowed to use them anyways.
-  dimensions: "cores:"
 }
 
 builder_mixins {
@@ -505,6 +537,7 @@ builder_mixins {
   recipe {
     name: "swarming/deterministic_build"
   }
+  execution_timeout_secs: 21600  # 2 x 3h for a double workload
 }
 
 builder_mixins {
@@ -545,19 +578,29 @@ builder_mixins {
 
 builder_mixins {
   name: "linux-angle-try"
-  mixins: "linux"
+  mixins: "linux-xenial"
   mixins: "angle-try"
 }
 
 builder_mixins {
-  name: "linux-dawn-ci"
-  mixins: "linux"
+  name: "linux-dawn-ci-builder"
+  dimensions: "cores:8"
+  mixins: "builderless"
   mixins: "dawn-ci"
+  mixins: "linux-xenial"
+}
+
+builder_mixins {
+  name: "linux-dawn-ci-tester"
+  dimensions: "cores:2"
+  mixins: "builderless"
+  mixins: "dawn-ci"
+  mixins: "linux-xenial"
 }
 
 builder_mixins {
   name: "linux-dawn-try"
-  mixins: "linux"
+  mixins: "linux-xenial"
   mixins: "dawn-try"
 }
 
@@ -571,12 +614,20 @@ builder_mixins {
 
 builder_mixins {
   name: "linux-optional-gpu-try"
-  mixins: "linux-try"
+  mixins: "linux-xenial-try"
   mixins: "gpu-optional-try"
   mixins: "gpu-slow-bot"
 }
 
 builder_mixins {
+  name: "linux-xenial-try"
+  mixins: "linux-xenial"
+  recipe {
+    properties: "mastername:tryserver.chromium.linux"
+  }
+}
+
+builder_mixins {
   name: "linux-try"
   mixins: "linux"
   recipe {
@@ -627,30 +678,41 @@ builder_mixins {
 }
 
 builder_mixins {
-  name: "linux-gpu-ci"
-  mixins: "linux"
+  name: "linux-gpu-ci-builder"
+  dimensions: "cores:8"
+  mixins: "builderless"
+  mixins: "linux-xenial"
   recipe {
     properties: "mastername:chromium.gpu"
   }
-  # Remove the cores dimensions for this mixin so that VMs of differing sizes
-  # can be used.
-  # This works here only because we use auto_builder_dimensions,
-  # so that only the bots that were earmarked for the builders
-  # will be allowed to use them anyways.
-  dimensions: "cores:"
 }
 
 builder_mixins {
-  name: "linux-gpu-fyi-ci"
-  mixins: "linux"
+  name: "linux-gpu-ci-tester"
+  dimensions: "cores:2"
+  mixins: "builderless"
+  mixins: "linux-xenial"
+  recipe {
+    properties: "mastername:chromium.gpu"
+  }
+}
+
+builder_mixins {
+  name: "linux-gpu-fyi-ci-builder"
+  dimensions: "cores:8"
+  mixins: "builderless"
   mixins: "gpu-fyi-ci"
   mixins: "gpu-slow-bot"
-  # Remove the cores dimensions for this mixin so that VMs of differing sizes
-  # can be used.
-  # This works here only because we use auto_builder_dimensions,
-  # so that only the bots that were earmarked for the builders
-  # will be allowed to use them anyways.
-  dimensions: "cores:"
+  mixins: "linux-xenial"
+}
+
+builder_mixins {
+  name: "linux-gpu-fyi-ci-tester"
+  dimensions: "cores:2"
+  mixins: "builderless"
+  mixins: "gpu-fyi-ci"
+  mixins: "gpu-slow-bot"
+  mixins: "linux-xenial"
 }
 
 builder_mixins {
@@ -714,6 +776,16 @@ builder_mixins {
   }
 }
 
+
+builder_mixins {
+  name: "xcode-11-caches"
+  caches: {
+    # Cache for Xcode 11 (build version 11m374r) needed for iOS FYI builds.
+    name: "xcode_ios_11m374r"
+    path: "xcode_ios_11m374r.app"
+  }
+}
+
 builder_mixins {
   name: "xcode-mac-9a235"
   caches: {
@@ -813,8 +885,9 @@ builder_mixins {
 
 builder_mixins {
   name: "win-dawn-ci"
-  mixins: "win"
+  mixins: "builderless"
   mixins: "dawn-ci"
+  mixins: "win"
 }
 
 builder_mixins {
@@ -826,6 +899,7 @@ builder_mixins {
 builder_mixins {
   name: "win-gpu-ci"
   mixins: "win"
+  mixins: "builderless"
   recipe {
     properties: "mastername:chromium.gpu"
   }
@@ -842,14 +916,8 @@ builder_mixins {
 builder_mixins {
   name: "win-gpu-fyi-ci"
   mixins: "win"
+  mixins: "builderless"
   mixins: "gpu-fyi-ci"
-  mixins: "gpu-slow-bot"
-  # Remove the cores dimensions for this mixin so that VMs of differing sizes
-  # can be used.
-  # This works here only because we use auto_builder_dimensions,
-  # so that only the bots that were earmarked for the builders
-  # will be allowed to use them anyways.
-  dimensions: "cores:"
 }
 
 builder_mixins {
@@ -873,6 +941,7 @@ builder_mixins {
   name: "builderless"
   auto_builder_dimension: NO
   dimensions: "builderless:1"
+  dimensions: "ssd:0"
 }
 
 buckets {
@@ -908,7 +977,7 @@ buckets {
       name: "Android arm Builder (dbg)"
       mixins: "android-ci"
       mixins: "builderless"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       execution_timeout_secs: 14400  # 4h
     }
 
@@ -917,94 +986,93 @@ buckets {
       mixins: "android-ci"
       mixins: "builderless"
       mixins: "goma-many-jobs-for-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       execution_timeout_secs: 14400  # 4h
     }
 
     builders {
       name: "Android ASAN (dbg)"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "Android FYI 32 dEQP Vk Release (Pixel 2)"
       mixins: "android-gpu-fyi-ci"
-    }
-
-    builders {
-      name: "Android FYI 32 dEQP Vk Release (Pixel XL)"
-      mixins: "android-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "Android FYI 32 Vk Release (Pixel 2)"
       mixins: "android-gpu-fyi-ci"
-    }
-
-    builders {
-      name: "Android FYI 32 Vk Release (Pixel XL)"
-      mixins: "android-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "Android FYI 64 dEQP Vk Release (Pixel 2)"
       mixins: "android-gpu-fyi-ci"
-    }
-
-    builders {
-      name: "Android FYI 64 dEQP Vk Release (Pixel XL)"
-      mixins: "android-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "Android FYI 64 Vk Release (Pixel 2)"
       mixins: "android-gpu-fyi-ci"
-    }
-
-    builders {
-      name: "Android FYI 64 Vk Release (Pixel XL)"
-      mixins: "android-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "Android FYI dEQP Release (Nexus 5X)"
       mixins: "android-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "Android FYI Release (Nexus 5)"
       mixins: "android-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "Android FYI Release (Nexus 5X)"
       mixins: "android-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "Android FYI Release (Nexus 6)"
       mixins: "android-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "Android FYI Release (Nexus 6P)"
       mixins: "android-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "Android FYI Release (Nexus 9)"
       mixins: "android-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "Android FYI Release (NVIDIA Shield TV)"
       mixins: "android-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "Android FYI Release (Pixel 2)"
       mixins: "android-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
+    }
+
+    builders {
+      name: "Android FYI SkiaRenderer Vulkan (Pixel 2)"
+      mixins: "android-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
@@ -1014,52 +1082,53 @@ buckets {
 
     builders {
       name: "Android WebView L (dbg)"
-      mixins: "android-ci"
+      mixins: "android-ci-goma-rbe-prod"
       mixins: "builderless"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
     }
 
     builders {
       name: "Android WebView M (dbg)"
-      mixins: "android-ci"
+      mixins: "android-ci-goma-rbe-prod"
       mixins: "builderless"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
     }
 
     builders {
       name: "Android WebView N (dbg)"
-      mixins: "android-ci"
+      mixins: "android-ci-goma-rbe-prod"
       mixins: "builderless"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
     }
 
     builders {
       name: "Android WebView O (dbg)"
-      mixins: "android-ci"
+      mixins: "android-ci-goma-rbe-prod"
       mixins: "builderless"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
     }
 
     builders {
       name: "Android WebView O NetworkService (dbg)"
       mixins: "android-fyi-ci"
       mixins: "builderless"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
     }
 
     builders {
       name: "Android x64 Builder (dbg)"
-      mixins: "android-ci"
+      mixins: "android-ci-goma-rbe-prod"
       mixins: "builderless"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       execution_timeout_secs: 14400  # 4h
     }
 
     builders {
       name: "Android x86 Builder (dbg)"
-      mixins: "android-ci"
+      mixins: "android-ci-goma-rbe-prod"
       mixins: "builderless"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
     }
 
     builders {
@@ -1070,51 +1139,69 @@ buckets {
     }
 
     builders {
+      name: "android-code-coverage"
+      mixins: "code-coverage"
+      mixins: "linux"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      dimensions: "cores:32"
+      dimensions: "ssd:1"
+    }
+
+    builders {
       name: "android-cronet-arm-dbg"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "android-cronet-arm-rel"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "android-cronet-arm64-dbg"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "android-cronet-arm64-rel"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "android-cronet-asan-arm-rel"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "android-cronet-kitkat-arm-rel"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "android-cronet-lollipop-arm-rel"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "android-cronet-marshmallow-arm64-rel"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
@@ -1132,134 +1219,168 @@ buckets {
     builders {
       name: "android-cronet-x86-dbg"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "android-cronet-x86-rel"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "android-incremental-dbg"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "android-jumbo-rel"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "android-kitkat-arm-rel"
       mixins: "android-ci"
+      mixins: "builderless"
       dimensions: "os:Ubuntu-16.04"
     }
 
     builders {
       name: "android-marshmallow-arm64-rel"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "builderless"
+      dimensions: "os:Ubuntu-16.04"
     }
 
     builders {
       name: "android-mojo-webview-rel"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+
+    builders {
+      name: "android-oreo-arm64-rel"
+      mixins: "android-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "Cast Android (dbg)"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "Deterministic Android"
       mixins: "deterministic"
-      mixins: "android-ci"
+      mixins: "android-ci-goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "Deterministic Android (dbg)"
       mixins: "deterministic"
-      mixins: "android-ci"
+      mixins: "android-ci-goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "KitKat Phone Tester (dbg)"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "KitKat Tablet Tester"
       mixins: "android-ci"
       mixins: "android-tablet-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "Lollipop Phone Tester"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "Lollipop Tablet Tester"
       mixins: "android-ci"
       mixins: "android-tablet-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "Marshmallow 64 bit Tester"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "Marshmallow Tablet Tester"
       mixins: "android-ci"
       mixins: "android-tablet-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "Nougat Phone Tester"
       mixins: "android-ci"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     # ChromeOS bots.
     builders {
       name: "chromeos-amd64-generic-asan-rel"
       mixins: "chromeos-ci"
+      mixins: "linux-xenial"
       mixins: "builderless"
     }
 
     builders {
       name: "chromeos-amd64-generic-cfi-thin-lto-rel"
       mixins: "chromeos-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "chromeos-amd64-generic-rel"
       mixins: "chromeos-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "chromeos-amd64-generic-rel-vm-tests"
       mixins: "fyi-ci"
       mixins: "linux"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "chromeos-arm-generic-rel"
       mixins: "chromeos-ci"
+      mixins: "linux-xenial"
       mixins: "builderless"
     }
 
@@ -1268,18 +1389,25 @@ buckets {
       mixins: "code-coverage"
       mixins: "fyi-ci"
       mixins: "linux"
+      mixins: "linux-xenial"
+      mixins: "builderless"
       dimensions: "cores:32"
+      dimensions: "ssd:1"
     }
 
     builders {
       name: "chromeos-kevin-rel-hw-tests"
       mixins: "fyi-ci"
       mixins: "linux"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "chromeos-kevin-rel"
       mixins: "chromeos-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
@@ -1287,12 +1415,17 @@ buckets {
       mixins: "code-coverage"
       mixins: "fyi-ci"
       mixins: "linux"
+      mixins: "linux-xenial"
+      mixins: "builderless"
       dimensions: "cores:32"
+      dimensions: "ssd:1"
     }
 
     builders {
       name: "linux-chromeos-dbg"
       mixins: "chromeos-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
@@ -1300,7 +1433,10 @@ buckets {
       mixins: "code-coverage"
       mixins: "fyi-ci"
       mixins: "linux"
+      mixins: "linux-xenial"
+      mixins: "builderless"
       dimensions: "cores:32"
+      dimensions: "ssd:1"
       recipe {
         properties: "exclude_sources:all_test_files"
       }
@@ -1310,61 +1446,80 @@ buckets {
       name: "linux-chromeos-rel"
       mixins: "chromeos-ci"
       mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "Linux ChromiumOS Full"
       mixins: "chromeos-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     # Fuchsia bots.
     builders {
       name: "Fuchsia ARM64"
       mixins: "linux-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "fuchsia-arm64-cast"
       mixins: "linux-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "Fuchsia x64"
       mixins: "linux-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "fuchsia-x64-cast"
       mixins: "linux-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "fuchsia-fyi-arm64-rel"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "fuchsia-fyi-x64-dbg"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "fuchsia-fyi-x64-rel"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     # Linux bots.
     builders {
       name: "Cast Audio Linux"
       mixins: "linux-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      dimensions: "ssd:1"
     }
 
     builders {
       name: "Cast Linux"
       mixins: "linux-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
       recipe {
         properties_j: "$build/goma:{\"jobs\": 50}"
       }
@@ -1373,15 +1528,17 @@ buckets {
     builders {
       name: "Deterministic Linux"
       mixins: "deterministic"
-      mixins: "linux-ci"
+      mixins: "linux-ci-goma-rbe-prod"
       mixins: "builderless"
+      mixins: "linux-xenial"
     }
 
     builders {
       name: "Deterministic Linux (dbg)"
       mixins: "deterministic"
-      mixins: "linux-ci"
+      mixins: "linux-ci-goma-rbe-prod"
       mixins: "builderless"
+      mixins: "linux-xenial"
 
       # This builder does local build, so needs large number of cores.
       dimensions: "cores:32"
@@ -1390,6 +1547,8 @@ buckets {
     builders {
       name: "Leak Detection Linux"
       mixins: "linux-ci-goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
@@ -1397,6 +1556,8 @@ buckets {
       mixins: "linux"
       mixins: "memory-ci"
       mixins: "linux-xenial"
+      mixins: "builderless"
+      dimensions: "ssd:1"
     }
 
     builders {
@@ -1404,31 +1565,42 @@ buckets {
       mixins: "linux"
       mixins: "memory-ci"
       mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "Linux ASan Tests (sandboxed)"
       mixins: "linux"
       mixins: "memory-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+
+    builders {
+      name: "linux-trusty-rel"
+      mixins: "linux-ci-goma-rbe-prod"
+      mixins: "builderless"
     }
 
     builders {
       name: "Linux Builder"
-      mixins: "linux-ci"
+      mixins: "linux-ci-goma-rbe-prod"
       mixins: "linux-xenial"
-      dimensions: "cores:32"
+      mixins: "builderless"
     }
 
     builders {
       name: "Linux Tests"
       mixins: "linux-ci"
       mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "linux-blink-animation-use-time-delta"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
@@ -1436,23 +1608,30 @@ buckets {
       mixins: "fyi-ci"
       mixins: "linux"
       mixins: "builderless"
+      mixins: "linux-xenial"
     }
 
     builders {
       name: "linux-blink-heap-verification"
       mixins: "fyi-ci"
       mixins: "linux"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "linux-blink-heap-unified-gc"
       mixins: "fyi-ci"
       mixins: "linux"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "linux_chromium_component_updater"
       mixins: "linux-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
       recipe {
         name: "findit/chromium/update_components"
       }
@@ -1463,49 +1642,73 @@ buckets {
       name: "linux-chromium-tests-staging-builder"
       mixins: "fyi-ci"
       mixins: "linux"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "linux-chromium-tests-staging-tests"
       mixins: "fyi-ci"
       mixins: "linux"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "linux-gcc-rel"
       mixins: "linux-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "linux-jumbo-rel"
       mixins: "linux-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "linux-ozone-rel"
       mixins: "linux-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+
+    builders {
+      name: "linux-fieldtrial-rel"
+      mixins: "builderless"
+      mixins: "fyi-ci"
+      mixins: "linux-xenial"
+    }
+
+    builders {
+      name: "linux-wpt-fyi-rel"
+      mixins: "builderless"
+      mixins: "fyi-ci"
+      mixins: "linux-xenial"
+      mixins: "experimental"
     }
 
     builders {
       name: "Linux Builder (dbg)"
       mixins: "linux-ci-goma-rbe-prod"
-      dimensions: "cores:32"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "Linux Builder (dbg)(32)"
       mixins: "linux-ci-goma-rbe-prod"
-      dimensions: "cores:32"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "Linux Tests (dbg)(1)"
       mixins: "linux-ci"
-    }
-
-    builders {
-      name: "Linux Tests (dbg)(1)(32)"
-      mixins: "linux-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
@@ -1513,6 +1716,7 @@ buckets {
       mixins: "linux"
       mixins: "linux-xenial"
       mixins: "memory-ci"
+      mixins: "builderless"
     }
 
     builders {
@@ -1520,103 +1724,112 @@ buckets {
       mixins: "linux"
       mixins: "linux-xenial"
       mixins: "memory-ci"
+      mixins: "builderless"
     }
 
     # chromium.gpu
     builders {
       name: "GPU Linux Builder"
-      mixins: "linux-gpu-ci"
+      mixins: "linux-gpu-ci-builder"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "GPU Linux Builder (dbg)"
-      mixins: "linux-gpu-ci"
+      mixins: "linux-gpu-ci-builder"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "Linux Debug (NVIDIA)"
-      mixins: "linux-gpu-ci"
+      mixins: "linux-gpu-ci-tester"
     }
 
     builders {
       name: "Linux Release (NVIDIA)"
-      mixins: "linux-gpu-ci"
+      mixins: "linux-gpu-ci-tester"
     }
 
     # chromium.gpu.fyi
     builders {
       name: "GPU FYI Linux Builder"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-builder"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "GPU FYI Linux Builder (dbg)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-builder"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "GPU FYI Linux Ozone Builder"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-builder"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "GPU FYI Linux dEQP Builder"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-builder"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "Linux FYI Experimental Release (Intel HD 630)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
 
     builders {
       name: "Linux FYI Release (NVIDIA)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
 
     builders {
       name: "Linux FYI Experimental Release (NVIDIA)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
 
     builders {
       name: "Linux FYI Debug (NVIDIA)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
 
     builders {
       name: "Linux FYI dEQP Release (NVIDIA)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
 
     builders {
       name: "Linux FYI SkiaRenderer Vulkan (NVIDIA)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
 
     builders {
       name: "Linux FYI Release (Intel HD 630)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
 
     builders {
       name: "Linux FYI dEQP Release (Intel HD 630)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
 
     builders {
       name: "Linux FYI GPU TSAN Release"
-      mixins: "linux-gpu-fyi-ci"
+      # Builder/tester, thus needs more cores
+      mixins: "linux-gpu-fyi-ci-builder"
+      mixins: "goma-rbe-prod"
     }
 
     builders {
       name: "Linux FYI Release (AMD R7 240)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
 
     builders {
       name: "Linux FYI Ozone (Intel)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
 
     # Mac bots.
@@ -1671,100 +1884,104 @@ buckets {
 
     # Note that the Mac testers are thin Linux VMs, triggering jobs on the
     # physical Mac hardware in the Swarming pool, and therefore use the
-    # linux-gpu-ci mixin.
+    # linux-gpu-ci-tester mixin.
     builders {
       name: "GPU Mac Builder"
       mixins: "mac-gpu-ci"
     }
     builders {
       name: "Mac Release (Intel)"
-      mixins: "linux-gpu-ci"
+      mixins: "linux-gpu-ci-tester"
     }
     builders {
       name: "Mac Retina Release (AMD)"
-      mixins: "linux-gpu-ci"
+      mixins: "linux-gpu-ci-tester"
     }
 
     builders {
       name: "GPU Mac Builder (dbg)"
       mixins: "mac-gpu-ci"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Mac Debug (Intel)"
-      mixins: "linux-gpu-ci"
+      mixins: "linux-gpu-ci-tester"
     }
     builders {
       name: "Mac Retina Debug (AMD)"
-      mixins: "linux-gpu-ci"
+      mixins: "linux-gpu-ci-tester"
     }
 
     # chromium.gpu.fyi
     builders {
       name: "GPU FYI Mac Builder"
       mixins: "mac-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "GPU FYI Mac Builder (dbg)"
       mixins: "mac-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "GPU FYI Mac dEQP Builder"
       mixins: "mac-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
     # Note that the Mac testers are all thin Linux VMs, triggering jobs on the
     # physical Mac hardware in the Swarming pool, and therefore use the
-    # linux-gpu-fyi-ci mixin.
+    # linux-gpu-fyi-ci-tester mixin.
     builders {
       name: "Mac FYI 10.14 Release (AMD)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Mac FYI 10.14 Release (Intel)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Mac FYI 10.14 Release (NVIDIA)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Mac FYI Release (Intel)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Mac FYI Debug (Intel)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Mac Pro FYI Release (AMD)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Mac FYI Retina Release (NVIDIA)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Mac FYI Retina Debug (NVIDIA)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Mac FYI Retina Release (AMD)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Mac FYI Retina Debug (AMD)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Mac FYI Experimental Release (Intel)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Mac FYI Experimental Retina Release (AMD)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Mac FYI Experimental Retina Release (NVIDIA)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
       # This bot has one machine backing its tests at the moment.
       # If it gets more, this should be switched back to gpu-slow-bot.
       # See crbug.com/853307 for more context.
@@ -1774,14 +1991,15 @@ buckets {
       name: "Mac FYI GPU ASAN Release"
       # Builder/tester, thus needs Mac (not Linux like testers-only)
       mixins: "mac-gpu-fyi-ci"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Mac FYI dEQP Release AMD"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Mac FYI dEQP Release Intel"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
 
     # iOS bots.
@@ -1796,7 +2014,7 @@ buckets {
     builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios12-beta-simulator" }
     builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-beta-simulator" }
     builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-sdk-device" }
-    builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-sdk-simulator" }
+    builders { mixins: "ios-ci" mixins: "fyi-ci" mixins: "xcode-11-caches" name: "ios13-sdk-simulator" }
 
     # Win bots.
     builders {
@@ -1810,6 +2028,24 @@ buckets {
       mixins: "win-ci"
     }
     builders {
+      name: "win-celab-builder-rel"
+      mixins: "celab-ci"
+      mixins: "win-ci"
+    }
+    builders {
+      name: "win-celab-tester-rel"
+      mixins: "celab-ci"
+      mixins: "win-ci"
+    }
+    builders {
+      name: "win-pixel-builder-rel"
+      mixins: "fyi-ci"
+    }
+    builders {
+      name: "win-pixel-tester-rel"
+      mixins: "fyi-ci"
+    }
+    builders {
       name: "win32-arm64-rel"
       dimensions: "os:Windows-10"
       dimensions: "cpu:x86"
@@ -2049,13 +2285,16 @@ buckets {
       name: "GPU Win Builder (dbg)"
       mixins: "win-gpu-ci"
     }
+    # Note that the Win testers are all thin Linux VMs, triggering jobs on the
+    # physical Win hardware in the Swarming pool, and therefore use the
+    # linux-gpu-ci-tester mixin.
     builders {
       name: "Win10 Debug (NVIDIA)"
-      mixins: "win-gpu-ci"
+      mixins: "linux-gpu-ci-tester"
     }
     builders {
       name: "Win10 Release (NVIDIA)"
-      mixins: "win-gpu-ci"
+      mixins: "linux-gpu-ci-tester"
     }
 
     # chromium.gpu.fyi
@@ -2087,129 +2326,130 @@ buckets {
       name: "GPU FYI XR Win Builder"
       mixins: "win-gpu-fyi-ci"
     }
+    # Note that the Win testers are all thin Linux VMs, triggering jobs on the
+    # physical Win hardware in the Swarming pool, and therefore use the
+    # linux-gpu-fyi-ci-tester mixin.
     builders {
       name: "Win10 FYI Debug (NVIDIA)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Win10 FYI dEQP Release (NVIDIA)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Win10 FYI Exp Release (NVIDIA)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Win10 FYI Release (Intel HD 630)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Win10 FYI dEQP Release (Intel HD 630)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Win10 FYI Exp Release (Intel HD 630)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Win10 FYI Release (NVIDIA)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Win10 FYI Release (AMD RX 550)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Win10 FYI Release (NVIDIA GeForce GTX 1660)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
       execution_timeout_secs: 64800 # 18h.
     }
     builders {
       name: "Win10 FYI Release XR Perf (NVIDIA)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Win7 FYI Debug (AMD)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Win7 FYI dEQP Release (AMD)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Win7 FYI Release (AMD)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Win7 FYI Release (NVIDIA)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Win7 FYI x64 dEQP Release (NVIDIA)"
-      mixins: "win-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
       name: "Win7 FYI x64 Release (NVIDIA)"
-      mixins: "win-gpu-fyi-ci"
-    }
-    builders {
-      # TODO(crbug.com/952071): make this configuration work, then
-      # switch all of the Windows testers to use thin Linux VMs.
-      name: "Win10 FYI Exp LinuxVM Testing (NVIDIA)"
-      mixins: "linux-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci-tester"
     }
 
     # chromium.dawn
     builders {
       name: "Dawn Linux x64 Builder"
-      mixins: "linux-dawn-ci"
+      mixins: "linux-dawn-ci-builder"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Dawn Linux x64 Release (Intel HD 630)"
-      mixins: "linux-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Linux x64 Release (NVIDIA)"
-      mixins: "linux-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Linux x64 DEPS Builder"
-      mixins: "linux-dawn-ci"
+      mixins: "linux-dawn-ci-builder"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Dawn Linux x64 DEPS Release (Intel HD 630)"
-      mixins: "linux-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Linux x64 DEPS Release (NVIDIA)"
-      mixins: "linux-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Mac x64 Builder"
       mixins: "mac-dawn-ci"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Dawn Mac x64 DEPS Builder"
       mixins: "mac-dawn-ci"
+      mixins: "goma-rbe-prod"
     }
     # Note that the Mac testers are all thin Linux VMs, triggering jobs on the
     # physical Mac hardware in the Swarming pool, and therefore use the
-    # linux-dawn-ci mixin.
+    # linux-dawn-ci-tester mixin.
     builders {
       name: "Dawn Mac x64 Release (AMD)"
-      mixins: "linux-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Mac x64 Release (Intel)"
-      mixins: "linux-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Mac x64 DEPS Release (AMD)"
-      mixins: "linux-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Mac x64 DEPS Release (Intel)"
-      mixins: "linux-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Win10 x86 Builder"
@@ -2219,21 +2459,24 @@ buckets {
       name: "Dawn Win10 x64 Builder"
       mixins: "win-dawn-ci"
     }
+    # Note that the Win testers are all thin Linux VMs, triggering jobs on the
+    # physical Win hardware in the Swarming pool, and therefore use the
+    # linux-dawn-ci-tester mixin.
     builders {
       name: "Dawn Win10 x86 Release (Intel HD 630)"
-      mixins: "win-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Win10 x64 Release (Intel HD 630)"
-      mixins: "win-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Win10 x86 Release (NVIDIA)"
-      mixins: "win-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Win10 x64 Release (NVIDIA)"
-      mixins: "win-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Win10 x86 DEPS Builder"
@@ -2245,19 +2488,19 @@ buckets {
     }
     builders {
       name: "Dawn Win10 x86 DEPS Release (Intel HD 630)"
-      mixins: "win-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Win10 x64 DEPS Release (Intel HD 630)"
-      mixins: "win-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Win10 x86 DEPS Release (NVIDIA)"
-      mixins: "win-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
     builders {
       name: "Dawn Win10 x64 DEPS Release (NVIDIA)"
-      mixins: "win-dawn-ci"
+      mixins: "linux-dawn-ci-tester"
     }
 
 
@@ -2282,24 +2525,23 @@ buckets {
     }
     builders {
       name: "MSAN Release (chained origins)"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
-    }
-    builders {
-      name: "Win7"
-      dimensions: "os:Windows-7"
-      mixins: "chromedriver-ci"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "TSAN Release"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Linux CFI"
-      dimensions: "os:Ubuntu-14.04"
       dimensions: "cores:32"
       mixins: "memory-ci-goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
 
       # TODO(thakis): Remove once https://crbug.com/927738 is resolved.
       execution_timeout_secs: 14400 # 4 hours
@@ -2311,41 +2553,49 @@ buckets {
     }
     builders {
       name: "WebKit Linux MSAN"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "memory-ci-goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Mac ASAN Release Media"
       dimensions: "os:Mac-10.13"
       dimensions: "cores:4"
       mixins: "fuzz-ci"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Libfuzzer Upload Linux MSan"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
       mixins: "libfuzzer"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "TSAN Debug"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "UBSan vptr Release"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Mac ASAN Release"
       dimensions: "os:Mac-10.13"
       dimensions: "cores:4"
       mixins: "fuzz-ci"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "WebKit Linux ASAN"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "memory-ci-goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Libfuzzer Upload Mac ASan"
@@ -2353,6 +2603,7 @@ buckets {
       dimensions: "cores:24"
       mixins: "fuzz-ci"
       mixins: "libfuzzer"
+      mixins: "goma-rbe-prod"
       execution_timeout_secs: 14400 # 4 hours
     }
     builders {
@@ -2369,23 +2620,33 @@ buckets {
       mixins: "memory-ci"
       # TODO(hinoka): Remove this after debugging.
       recipe {
-        properties_j: "$build/goma:{\"debug\": true}"
+        properties_j: <<END
+        $build/goma: {
+          "server_host": "goma.chromium.org",
+          "rpc_extra_params": "?prod",
+          "debug": true
+        }
+        END
       }
     }
     builders {
       name: "UBSan Release"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "ChromiumOS ASAN Release"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "ASAN Release Media"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "win-archive-dbg"
@@ -2401,58 +2662,69 @@ buckets {
     }
     builders {
       name: "WebKit Linux Leak"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "memory-ci-goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Linux ChromiumOS MSan Tests"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "memory-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "android-archive-dbg"
-      dimensions: "os:Ubuntu-14.04"
       # Bump to 32 if needed.
       dimensions: "cores:8"
       mixins: "chromium-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "android-archive-rel"
-      dimensions: "os:Ubuntu-14.04"
       dimensions: "cores:32"
       mixins: "chromium-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Oreo Phone Tester"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "android-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "android-pie-arm64-dbg"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "android-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders {
       name: "ASan Debug (32-bit x86 with V8-ARM)"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Linux remote_run Tester"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "WebKit Mac10.13 (retina)"
       dimensions: "os:Mac-10.13"
       mixins: "mac-ci"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Afl Upload Linux ASan"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
       mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
       recipe {
         name: "chromium_afl"
       }
@@ -2464,8 +2736,9 @@ buckets {
     }
     builders {
       name: "Linux MSan Tests"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "memory-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Mac ASan 64 Tests (1)"
@@ -2479,8 +2752,10 @@ buckets {
     }
     builders {
       name: "ASAN Debug"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Mac deterministic"
@@ -2488,26 +2763,33 @@ buckets {
       dimensions: "cores:"
       mixins: "fyi-ci"
       mixins: "deterministic"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Site Isolation Android"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "MSAN Release (no origins)"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Linux Chromium OS ASan LSan Builder"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "memory-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "linux-annotator-rel"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "win-annotator-rel"
@@ -2520,24 +2802,22 @@ buckets {
       dimensions: "os:Mac-10.13"
       dimensions: "cores:4"
       mixins: "fyi-ci"
+      mixins: "goma-rbe-prod"
     }
     builders {
+      # Do not use builderless for this (crbug.com/980080).
       name: "Libfuzzer Upload Linux UBSan"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
       mixins: "libfuzzer"
+      mixins: "linux-xenial"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "VR Linux"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
       mixins: "goma-rbe-prod"
-    }
-    builders {
-      name: "linux-tcmalloc-rel"
-      dimensions: "os:Ubuntu-14.04"
-      dimensions: "cores:32"
-      mixins: "fyi-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Mac deterministic (dbg)"
@@ -2545,28 +2825,37 @@ buckets {
       dimensions: "cores:"
       mixins: "fyi-ci"
       mixins: "deterministic"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "ASAN Release"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Libfuzzer Upload Linux ASan Debug"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
       mixins: "libfuzzer"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Libfuzzer Upload Linux V8-ARM64 ASan Debug"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
       mixins: "libfuzzer"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Closure Compilation Linux"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
       recipe {
         name: "closure_compilation"
       }
@@ -2577,94 +2866,97 @@ buckets {
       mixins: "fyi-ci"
     }
     builders {
-      name: "Chromium Mac 10.13"
-      dimensions: "os:Mac-10.13"
-      dimensions: "cores:4"
-      mixins: "fyi-ci"
-    }
-    builders {
       name: "linux-archive-dbg"
-      dimensions: "os:Ubuntu-14.04"
       # Bump to 32 if needed.
       dimensions: "cores:8"
       mixins: "chromium-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "linux-archive-rel"
-      dimensions: "os:Ubuntu-14.04"
       dimensions: "cores:32"
       mixins: "chromium-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Libfuzzer Upload Linux ASan"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
       mixins: "libfuzzer"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Libfuzzer Upload Linux V8-ARM64 ASan"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
       mixins: "libfuzzer"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Libfuzzer Upload Linux32 ASan Debug"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
       mixins: "libfuzzer"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Libfuzzer Upload Linux32 ASan"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
       mixins: "libfuzzer"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Libfuzzer Upload Linux32 V8-ARM ASan Debug"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
       mixins: "libfuzzer"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Libfuzzer Upload Linux32 V8-ARM ASan"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
       mixins: "libfuzzer"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "Libfuzzer Upload Chrome OS ASan"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
       mixins: "libfuzzer"
-    }
-    builders {
-      name: "Mac 10.6"
-      dimensions: "os:Mac-10.12.2"
-      mixins: "chromedriver-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Android CFI"
-      dimensions: "os:Ubuntu-14.04"
       dimensions: "cores:32"
       # TODO(https://crbug.com/919430) Remove the larger timeout once compile
       # times have been brought down to reasonable level
       execution_timeout_secs: 16200  # 4.5h
-      mixins: "memory-ci"
-    }
-    builders {
-      name: "chromeos-amd64-generic-rel-goma-canary"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "fyi-ci"
+      mixins: "memory-ci-goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Linux MSan Builder"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "memory-ci-goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "ASan Release Media (32-bit x86 with V8-ARM)"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "mac-hermetic-upgrade-rel"
@@ -2676,17 +2968,21 @@ buckets {
       mixins: "fyi-ci"
       # This is launching & collecting entirely isolated tests.
       # OS shouldn't matter.
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Mojo ChromiumOS"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Linux remote_run Builder"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Win ASan Release Media"
@@ -2707,29 +3003,32 @@ buckets {
     }
     builders {
       name: "Linux ChromiumOS MSan Builder"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "memory-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Mojo Linux"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
       mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Linux Chromium OS ASan LSan Tests (1)"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "memory-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Memory Infra Tester"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "android-fyi-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "ios-device-goma-canary-clobber"
-      dimensions: "os:Mac-10.13"
-      dimensions: "cores:4"
+      mixins: "ios"
       mixins: "fyi-ci"
       recipe {
         name: "ios/unified_builder_tester"
@@ -2737,8 +3036,10 @@ buckets {
     }
     builders {
       name: "ASan Release (32-bit x86 with V8-ARM)"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "WebKit Win10"
@@ -2759,86 +3060,82 @@ buckets {
     }
     builders {
       name: "Linux Viz"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
-    }
-    builders {
-      name: "Linux ARM"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "fyi-ci"
-    }
-    builders {
-      name: "Linux"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "chromedriver-ci"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Jumbo Linux x64"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Mojo Android"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     # Goma RBE ToT/Staging/FYI
     builders {
       name: "Chromium Linux Goma RBE ToT"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
     }
     builders {
       name: "Chromium Linux Goma RBE ToT (ATS)"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ats"
       mixins: "goma-ci"
     }
     builders {
       name: "Chromium Linux Goma RBE Staging"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
       mixins: "goma-rbe-staging"
     }
     builders {
       name: "Chromium Linux Goma RBE Staging (clobber)"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
       mixins: "goma-rbe-staging"
     }
     builders {
       name: "Chromium Linux Goma RBE Staging (dbg)"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
       mixins: "goma-rbe-staging"
     }
     builders {
       name: "Chromium Linux Goma RBE Staging (dbg) (clobber)"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
       mixins: "goma-rbe-staging"
     }
     builders {
       name: "Chromium Linux Goma RBE Prod"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
       mixins: "goma-rbe-prod"
     }
     builders {
       name: "Chromium Linux Goma RBE Prod (clobber)"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
       mixins: "goma-rbe-prod"
     }
     builders {
       name: "Chromium Linux Goma RBE Prod (dbg)"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
       mixins: "goma-rbe-prod"
     }
     builders {
       name: "Chromium Linux Goma RBE Prod (dbg) (clobber)"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
       mixins: "goma-rbe-prod"
     }
@@ -2921,87 +3218,87 @@ buckets {
     }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE ToT"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
     }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE ToT (ATS)"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ats"
       mixins: "goma-ci"
     }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE Staging"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
       mixins: "goma-rbe-staging"
     }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE Prod"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
       mixins: "goma-rbe-prod"
     }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE Prod (clobber)"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
       mixins: "goma-rbe-prod"
     }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE Prod (dbg)"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
       mixins: "goma-rbe-prod"
     }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
       mixins: "goma-rbe-prod"
     }
     # Goma RBE FYI
     builders {
       name: "Cast Linux (Goma RBE FYI)"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "builderless"
       mixins: "goma-ci"
       mixins: "goma-rbe-prod-ats"
+      mixins: "linux-xenial"
     }
     builders {
       name: "chromeos-amd64-generic-rel (Goma RBE FYI)"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "builderless"
       mixins: "goma-ci"
       mixins: "goma-ats"
+      mixins: "linux-xenial"
     }
     builders {
       name: "fuchsia-fyi-arm64-rel (Goma RBE FYI)"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "builderless"
       mixins: "goma-ci"
       mixins: "goma-rbe-prod-ats"
+      mixins: "linux-xenial"
     }
     builders {
       name: "fuchsia-fyi-x64-rel (Goma RBE FYI)"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "builderless"
       mixins: "goma-ci"
       mixins: "goma-rbe-prod-ats"
+      mixins: "linux-xenial"
     }
     builders {
       name: "Linux ASan LSan Builder (Goma RBE FYI)"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "builderless"
       mixins: "goma-ci"
       mixins: "goma-rbe-prod-ats"
+      mixins: "linux-xenial"
     }
     builders {
       name: "Linux MSan Builder (Goma RBE FYI)"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "builderless"
       mixins: "goma-ci"
       mixins: "goma-rbe-prod-ats"
+      mixins: "linux-xenial"
     }
     # Goma Staging
     builders {
@@ -3013,7 +3310,7 @@ buckets {
     }
     builders {
       name: "Chromium Linux Goma Staging"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "goma-ci"
     }
     builders {
@@ -3040,9 +3337,16 @@ buckets {
       mixins: "fyi-ci"
     }
     builders {
+      name: "chromeos-amd64-generic-rel-goma-canary"
+      mixins: "fyi-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
       name: "Android Builder (dbg) Goma Canary"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "Mac Goma Canary LocalOutputCache"
@@ -3068,13 +3372,17 @@ buckets {
     }
     builders {
       name: "Linux x64 Goma Canary LocalOutputCache"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "builderless"
+      mixins: "linux-xenial"
     }
     builders {
       name: "Linux Builder Goma Canary"
+      # keep to use trusty for this until chrome drops support of development
+      # on trusty.
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "builderless"
     }
     builders {
       name: "Win cl.exe Goma Canary LocalOutputCache"
@@ -3104,8 +3412,9 @@ buckets {
     }
     builders {
       name: "Linux x64 Goma Canary (clobber)"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     # Goma Latest Client
     builders {
@@ -3127,7 +3436,7 @@ buckets {
     }
     builders {
       name: "Android Builder (dbg) Goma Latest Client"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "fyi-ci"
     }
     builders {
@@ -3154,12 +3463,12 @@ buckets {
     }
     builders {
       name: "Linux x64 Goma Latest Client LocalOutputCache"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "fyi-ci"
     }
     builders {
       name: "Linux Builder Goma Latest Client"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "fyi-ci"
     }
     builders {
@@ -3190,18 +3499,17 @@ buckets {
     }
     builders {
       name: "Linux x64 Goma Latest Client (clobber)"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "fyi-ci"
     }
     builders {
       name: "chromeos-amd64-generic-rel-goma-latest"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
       mixins: "fyi-ci"
     }
     builders {
       name: "ios-device-goma-latest-clobber"
-      dimensions: "os:Mac-10.13"
-      dimensions: "cores:4"
+      mixins: "ios"
       mixins: "fyi-ci"
       recipe {
         name: "ios/unified_builder_tester"
@@ -3264,7 +3572,7 @@ buckets {
     builders { name: "findit_variable" }
     builders {
       name: "linux_chromium_bot_db_exporter"
-      mixins: "linux"
+      mixins: "linux-xenial"
       recipe {
         name: "findit/chromium/export_bot_db"
         properties: "gs_bucket:findit-for-me"
@@ -3380,8 +3688,16 @@ buckets {
     }
 
     # Keep builders sorted by OS, then name.
-    builders { mixins: "android-angle-try" name: "android_angle_deqp_rel_ng" }
-    builders { mixins: "android-angle-try" name: "android_angle_rel_ng" }
+    builders {
+      mixins: "android-angle-try"
+      mixins: "goma-rbe-prod"
+      name: "android_angle_deqp_rel_ng"
+    }
+    builders {
+      mixins: "android-angle-try"
+      mixins: "goma-rbe-prod"
+      name: "android_angle_rel_ng"
+    }
     builders { mixins: "android-angle-try" name: "android_angle_vk32_deqp_rel_ng" }
     builders { mixins: "android-angle-try" name: "android_angle_vk32_rel_ng" }
     builders { mixins: "android-angle-try" name: "android_angle_vk64_deqp_rel_ng" }
@@ -3389,8 +3705,8 @@ buckets {
     builders {
       mixins: "android-try"
       mixins: "builderless"
+      mixins: "linux-xenial"
       name: "android_cronet_tester"
-      dimensions: "os:Ubuntu-14.04"
       recipe {
         properties: "buildername:android-cronet-arm-dbg"
       }
@@ -3398,38 +3714,50 @@ buckets {
     builders {
       mixins: "android-try"
       mixins: "builderless"
+      mixins: "linux-xenial"
       name: "android-cronet-arm-dbg"
-      dimensions: "os:Ubuntu-14.04"
     }
     builders {
       mixins: "android-try"
       mixins: "goma-j150"
+      mixins: "builderless"
       name: "android-kitkat-arm-rel"
       dimensions: "os:Ubuntu-16.04"
     }
     builders {
+      name: "android-marshmallow-arm64-rel"
       mixins: "android-try"
+      mixins: "builderless"
       mixins: "goma-j300"
-      name: "android-marshmallow-arm64-rel"
-      dimensions: "os:Ubuntu-14.04"
+      dimensions: "os:Ubuntu-16.04"
       dimensions: "cores:16"
+      dimensions: "ssd:1"
     }
     builders {
       mixins: "android-try"
       name: "android-oreo-arm64-cts-networkservice-dbg"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "android-try"
+      name: "android-oreo-arm64-rel"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       mixins: "android-try"
       mixins: "goma-j300"
       name: "android_arm64_dbg_recipe"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "android-binary-size"
       mixins: "android-try"
       mixins: "goma-j150"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
       recipe {
         name: "binary_size_trybot"
       }
@@ -3437,139 +3765,215 @@ buckets {
     builders {
       mixins: "android-try"
       name: "android_blink_rel"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       mixins: "android-try"
       mixins: "goma-j300"
       name: "android_clang_dbg_recipe"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       mixins: "android-try"
       mixins: "goma-j150"
       name: "android_compile_dbg"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       mixins: "android-try"
       name: "android_cronet"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       mixins: "android-try"
       name: "android_n5x_swarming_dbg"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       mixins: "android-try"
       name: "cast_shell_android"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders { mixins: "android-optional-gpu-try" name: "android_optional_gpu_tests_rel" }
     builders {
       mixins: "android-try"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
       name: "android_unswarmed_pixel_aosp"
-      dimensions: "os:Ubuntu-14.04"
     }
     builders {
       mixins: "android-optional-gpu-try"
+      mixins: "goma-rbe-prod"
       name: "gpu-fyi-try-android-l-nexus-5-32"
     }
     builders {
       mixins: "android-optional-gpu-try"
+      mixins: "goma-rbe-prod"
       name: "gpu-fyi-try-android-l-nexus-6-32"
     }
     builders {
       mixins: "android-optional-gpu-try"
+      mixins: "goma-rbe-prod"
       name: "gpu-fyi-try-android-m-nexus-6p-64"
     }
     builders {
       mixins: "android-optional-gpu-try"
+      mixins: "goma-rbe-prod"
       name: "gpu-fyi-try-android-m-nexus-9-64"
     }
     builders {
       mixins: "android-optional-gpu-try"
+      mixins: "goma-rbe-prod"
       name: "gpu-fyi-try-android-n-nvidia-shield-tv-64"
     }
     builders {
       mixins: "android-optional-gpu-try"
+      mixins: "goma-rbe-prod"
       name: "gpu-fyi-try-android-p-pixel-2-32"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-fyi-try-android-p-pixel-2-32-vk"
-    }
-    builders {
-      mixins: "android-optional-gpu-try"
-      name: "gpu-fyi-try-android-p-pixel-2-32-deqp-vk"
-    }
-    builders {
-      mixins: "android-optional-gpu-try"
-      name: "gpu-fyi-try-android-p-pixel-2-64-vk"
-    }
-    builders {
-      mixins: "android-optional-gpu-try"
-      name: "gpu-fyi-try-android-p-pixel-2-64-deqp-vk"
+      mixins: "goma-rbe-prod"
+      name: "gpu-fyi-try-android-p-pixel-2-skv-32"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-fyi-try-android-p-pixel-xl-32-vk"
+      mixins: "goma-rbe-prod"
+      name: "gpu-fyi-try-android-q-pixel-2-deqp-vk-32"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-fyi-try-android-p-pixel-xl-32-deqp-vk"
+      mixins: "goma-rbe-prod"
+      name: "gpu-fyi-try-android-q-pixel-2-deqp-vk-64"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-fyi-try-android-p-pixel-xl-64-vk"
+      mixins: "goma-rbe-prod"
+      name: "gpu-fyi-try-android-q-pixel-2-vk-32"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-fyi-try-android-p-pixel-xl-64-deqp-vk"
+      mixins: "goma-rbe-prod"
+      name: "gpu-fyi-try-android-q-pixel-2-vk-64"
     }
     builders {
       mixins: "android-try"
       mixins: "deterministic"
+      mixins: "goma-rbe-prod"
       name: "android-deterministic-rel"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       mixins: "android-try"
       mixins: "deterministic"
+      mixins: "goma-rbe-prod"
       name: "android-deterministic-dbg"
-      dimensions: "os:Ubuntu-14.04"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       mixins: "android-try"
       name: "try-nougat-phone-tester"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "android-try"
+      name: "android-oreo-arm64-dbg"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "android-try"
+      name: "android-pie-arm64-dbg"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
-    builders { mixins: "chromeos-try" name: "chromeos-amd64-generic-cfi-thin-lto-rel" }
-    builders { mixins: "chromeos-try" name: "chromeos-amd64-generic-rel" }
-    builders { mixins: "chromeos-try" name: "chromeos-arm-generic-rel" }
-    builders { mixins: "chromeos-try" name: "chromeos-kevin-compile-rel" }
-    builders { mixins: "chromeos-try" name: "chromeos-kevin-rel" }
-    builders { mixins: "chromeos-try" name: "linux-chromeos-compile-dbg" }
-    builders { mixins: "chromeos-try" name: "linux-chromeos-dbg" }
+    builders {
+      mixins: "chromeos-try"
+      name: "chromeos-amd64-generic-cfi-thin-lto-rel"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "chromeos-try"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      name: "chromeos-amd64-generic-rel"
+    }
+    builders {
+      mixins: "chromeos-try"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      name: "chromeos-arm-generic-rel"
+    }
+    builders {
+      mixins: "chromeos-try"
+      name: "chromeos-kevin-compile-rel"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "chromeos-try"
+      name: "chromeos-kevin-rel"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "chromeos-try"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      name: "linux-chromeos-compile-dbg"
+    }
+    builders {
+      mixins: "chromeos-try"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+      name: "linux-chromeos-dbg"
+    }
     builders {
       mixins: "chromeos-try"
       mixins: "linux-xenial"
       mixins: "goma-j150"
+      mixins: "builderless"
       name: "linux-chromeos-rel"
     }
 
-    builders { mixins: "linux-try" name: "cast_shell_audio_linux" }
-    builders { mixins: "linux-try" name: "cast_shell_linux" }
-    builders { mixins: "linux-try" name: "chromium_devtools" }
+    builders {
+      mixins: "linux-try"
+      name: "cast_shell_audio_linux"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "linux-try"
+      name: "cast_shell_linux"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
     builders {
       mixins: "linux-try"
       mixins: "linux-xenial"
       name: "chromium_presubmit"
+      mixins: "builderless"
       recipe {
-        name: "run_presubmit"
+        name: "presubmit"
         properties: "repo_name:chromium"
-        properties_j: "runhooks:true"
+        properties_j: <<END
+        $depot_tools/presubmit: {
+          "runhooks": true,
+          "timeout_s": 480
+        }
+        END
       }
     }
     builders {
@@ -3578,17 +3982,54 @@ buckets {
       recipe {
         name: "closure_compilation"
       }
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     builders { mixins: "linux-dawn-try" name: "dawn-linux-x64-deps-rel" }
 
-    builders { mixins: "linux-try" name: "fuchsia_arm64" }
-    builders { mixins: "linux-try" name: "fuchsia-arm64-cast" }
-    builders { mixins: "linux-try" name: "fuchsia-fyi-arm64-rel" }
-    builders { mixins: "linux-try" name: "fuchsia-fyi-x64-dbg" }
-    builders { mixins: "linux-try" name: "fuchsia-fyi-x64-rel" }
-    builders { mixins: "linux-try" name: "fuchsia_x64" }
-    builders { mixins: "linux-try" name: "fuchsia-x64-cast" }
+    builders {
+      mixins: "linux-try"
+      name: "fuchsia_arm64"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "builderless"
+      mixins: "linux-try"
+      mixins: "linux-xenial"
+      name: "fuchsia-arm64-cast"
+    }
+    builders {
+      mixins: "builderless"
+      mixins: "linux-try"
+      mixins: "linux-xenial"
+      name: "fuchsia-fyi-arm64-rel"
+    }
+    builders {
+      mixins: "builderless"
+      mixins: "linux-try"
+      mixins: "linux-xenial"
+      name: "fuchsia-fyi-x64-dbg"
+    }
+    builders {
+      mixins: "builderless"
+      mixins: "linux-try"
+      mixins: "linux-xenial"
+      name: "fuchsia-fyi-x64-rel"
+    }
+    builders {
+      mixins: "linux-try"
+      name: "fuchsia_x64"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "builderless"
+      mixins: "linux-try"
+      mixins: "linux-xenial"
+      name: "fuchsia-x64-cast"
+    }
     builders {
       mixins: "linux-optional-gpu-try"
       name: "gpu-fyi-try-linux-intel-dqp"
@@ -3619,6 +4060,11 @@ buckets {
     }
     builders {
       mixins: "linux-optional-gpu-try"
+      name: "gpu-fyi-try-linux-nvidia-skv"
+    }
+    builders {
+      mixins: "linux-optional-gpu-try"
+      mixins: "goma-rbe-prod"
       name: "gpu-fyi-try-linux-nvidia-tsn"
     }
     builders {
@@ -3629,28 +4075,58 @@ buckets {
       mixins: "linux-try"
       mixins: "goma-rbe-prod"
       name: "leak_detection_linux"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders { mixins: "linux-angle-try" name: "fuchsia-angle-rel" }
-    builders { mixins: "linux-angle-try" name: "linux-angle-rel" }
-    builders { mixins: "linux-angle-try" name: "linux_angle_deqp_rel_ng" }
-    builders { mixins: "linux-angle-try" name: "linux_angle_ozone_rel_ng" }
+    builders {
+      mixins: "linux-angle-try"
+      name: "linux-angle-rel"
+    }
+    builders {
+      mixins: "linux-angle-try"
+      name: "linux_angle_deqp_rel_ng"
+    }
+    builders {
+      mixins: "linux-angle-try"
+      name: "linux_angle_ozone_rel_ng"
+    }
     builders {
       mixins: "builderless"
       mixins: "linux-try"
+      mixins: "linux-xenial"
       name: "linux-blink-heap-concurrent-marking-tsan-rel"
     }
-    builders { mixins: "linux-try" name: "linux-blink-heap-verification-try" }
-    builders { mixins: "linux-try" name: "linux-dcheck-off-rel" }
     builders {
       mixins: "linux-try"
-      mixins: "goma-j150"
-      name: "linux-goma-rbe-staging-rel"
+      name: "linux-blink-heap-verification-try"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "linux-try"
+      mixins: "goma-rbe-prod"
+      name: "linux-dcheck-off-rel"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "linux-try"
+      name: "linux-gcc-rel"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "linux-try"
+      name: "linux-jumbo-rel"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
-    builders { mixins: "linux-try" name: "linux-gcc-rel" }
-    builders { mixins: "linux-try" name: "linux-jumbo-rel" }
     builders {
       name: "linux-libfuzzer-asan-rel"
       mixins: "linux-try"
+      mixins: "linux-xenial"
+      mixins: "builderless"
       recipe {
         name: "chromium_libfuzzer_trybot"
       }
@@ -3659,27 +4135,49 @@ buckets {
       mixins: "builderless"
       mixins: "linux-try"
       name: "linux-ozone-rel"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       mixins: "linux-try"
       mixins: "goma-rbe-prod"
-      name: "linux-trusty-webkit-msan-rel"
+      name: "linux-webkit-msan-rel"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       mixins: "linux-try"
+      # TODO(crbug.com/986191): re-enable RBE+ATS when the issue is fixed.
+      # mixins: "goma-rbe-prod-ats"
       name: "linux_arm"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "linux-try"
+      name: "linux_chromium_analysis"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "linux-try"
+      name: "linux_chromium_archive_rel_ng"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
-    builders { mixins: "linux-try" name: "linux_chromium_analysis" }
-    builders { mixins: "linux-try" name: "linux_chromium_archive_rel_ng" }
     builders {
       mixins: "linux-try"
       mixins: "linux-xenial"
       mixins: "goma-j150"
       name: "linux_chromium_asan_rel_ng"
+      mixins: "builderless"
+      dimensions: "ssd:1"
     }
     builders {
       mixins: "linux-try"
       mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
       name: "linux_chromium_cfi_rel_ng"
       dimensions: "cores:32"
     }
@@ -3687,69 +4185,128 @@ buckets {
       mixins: "linux-try"
       mixins: "goma-j150"
       name: "linux_chromium_chromeos_asan_rel_ng"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       mixins: "linux-try"
       mixins: "goma-j150"
       name: "linux_chromium_chromeos_msan_rel_ng"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "linux_chromium_clobber_deterministic",
       mixins: "linux-try"
       mixins: "deterministic"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "linux-try"
+      name: "linux_chromium_clobber_rel_ng"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "linux-try"
+      name: "linux_chromium_compile_dbg_32_ng"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
-    builders { mixins: "linux-try" name: "linux_chromium_clobber_rel_ng" }
-    builders { mixins: "linux-try" name: "linux_chromium_compile_dbg_32_ng" }
     builders {
       mixins: "linux-try"
       mixins: "linux-debug-cache"
       mixins: "goma-j150"
+      mixins: "linux-xenial"
+      mixins: "builderless"
       name: "linux_chromium_compile_dbg_ng"
     }
-    builders { mixins: "linux-try" name: "linux_chromium_compile_rel_ng" }
     builders {
       mixins: "linux-try"
       mixins: "goma-rbe-prod"
-      name: "linux_chromium_dbg_32_ng"
+      name: "linux_chromium_compile_rel_ng"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
-      mixins: "linux-try"
-      mixins: "linux-debug-cache"
+      mixins: "builderless"
       mixins: "goma-rbe-prod"
+      mixins: "linux-debug-cache"
+      mixins: "linux-try"
+      mixins: "linux-xenial"
       name: "linux_chromium_dbg_ng"
     }
     builders {
       mixins: "linux-try"
       mixins: "goma-rbe-prod-j150"
       name: "linux_chromium_msan_rel_ng"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       mixins: "linux-try"
       mixins: "goma-j150"
       name: "linux-coverage-rel"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       mixins: "linux-try"
       mixins: "linux-xenial"
       mixins: "goma-j150"
+      mixins: "builderless"
       name: "linux-rel"
     }
     builders {
       mixins: "linux-try"
+      mixins: "goma-rbe-prod-j150"
+      mixins: "builderless"
+      name: "linux-trusty-rel"
+    }
+    builders {
+      mixins: "linux-try"
       mixins: "linux-xenial"
       mixins: "goma-j150"
+      mixins: "builderless"
       name: "linux_chromium_tsan_rel_ng"
     }
-    builders { mixins: "linux-try" name: "linux_chromium_ubsan_rel_ng" }
-    builders { mixins: "linux-dawn-try" name: "linux-dawn-rel" }
-    builders { mixins: "linux-try" name: "linux_layout_tests_composite_after_paint" }
-    builders { mixins: "linux-try" name: "linux_layout_tests_layout_ng" }
+    builders {
+      mixins: "linux-try"
+      name: "linux_chromium_ubsan_rel_ng"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "linux-dawn-try"
+      mixins: "goma-rbe-prod"
+      name: "linux-dawn-rel"
+    }
+    builders {
+      mixins: "linux-try"
+      name: "linux_layout_tests_composite_after_paint"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "linux-try"
+      name: "linux_layout_tests_layout_ng"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
     builders {
       mixins: "linux-try"
       mixins: "goma-rbe-prod"
       name: "linux_mojo"
+      mixins: "linux-xenial"
+      mixins: "builderless"
+    }
+    builders {
+      mixins: "linux-try"
+      name: "linux_mojo_chromeos"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
-    builders { mixins: "linux-try" name: "linux_mojo_chromeos" }
     builders { mixins: "linux-optional-gpu-try" name: "linux_optional_gpu_tests_rel" }
     builders {
       mixins: "linux-try"
@@ -3764,14 +4321,19 @@ buckets {
     builders { mixins: "ios-try" name: "ios-uirefresh-simulator" }
     builders { mixins: "ios-try" name: "ios12-beta-simulator" }
     builders { mixins: "ios-try" name: "ios13-beta-simulator" }
-    builders { mixins: "ios-try" name: "ios13-sdk-simulator" }
+    builders { mixins: "ios-try" mixins: "xcode-11-caches" name: "ios13-sdk-simulator" }
     builders { mixins: "ios-try" name: "ios-simulator-full-configs" }
     builders { mixins: "ios-try" name: "ios-simulator-eg" }
     builders { mixins: "ios-try" name: "ios-simulator-xcode-clang" }
     builders { mixins: "ios-try" name: "ios-slimnav" }
-    builders { mixins: "mac-dawn-try" name: "dawn-mac-x64-deps-rel" }
+    builders {
+      mixins: "mac-dawn-try"
+      mixins: "goma-rbe-prod"
+      name: "dawn-mac-x64-deps-rel"
+    }
     builders {
       mixins: "mac-optional-gpu-try"
+      mixins: "goma-rbe-prod"
       name: "gpu-fyi-try-mac-amd-dqp"
     }
     builders {
@@ -3780,6 +4342,7 @@ buckets {
     }
     builders {
       mixins: "mac-optional-gpu-try"
+      mixins: "goma-rbe-prod"
       name: "gpu-fyi-try-mac-amd-retina-dbg"
     }
     builders {
@@ -3792,15 +4355,18 @@ buckets {
     }
     builders {
       mixins: "mac-optional-gpu-try"
+      mixins: "goma-rbe-prod"
       name: "gpu-fyi-try-mac-asan"
     }
     builders {
       mixins: "mac-optional-gpu-try"
       name: "gpu-fyi-try-mac-intel-dbg"
+      mixins: "goma-rbe-prod"
     }
     builders {
       mixins: "mac-optional-gpu-try"
       name: "gpu-fyi-try-mac-intel-dqp"
+      mixins: "goma-rbe-prod"
     }
     builders {
       mixins: "mac-optional-gpu-try"
@@ -3812,6 +4378,7 @@ buckets {
     }
     builders {
       mixins: "mac-optional-gpu-try"
+      mixins: "goma-rbe-prod"
       name: "gpu-fyi-try-mac-nvidia-retina-dbg"
     }
     builders {
@@ -3828,13 +4395,19 @@ buckets {
     }
     builders {
       mixins: "mac-optional-gpu-try"
+      mixins: "goma-rbe-prod"
       name: "gpu-try-mac-amd-retina-dbg"
     }
     builders {
       mixins: "mac-optional-gpu-try"
+      mixins: "goma-rbe-prod"
       name: "gpu-try-mac-intel-dbg"
     }
-    builders { mixins: "mac-angle-try" name: "mac-angle-rel" }
+    builders {
+      mixins: "mac-angle-try"
+      mixins: "goma-rbe-prod"
+      name: "mac-angle-rel"
+    }
     builders {
       mixins: "mac-try"
       name: "mac-jumbo-rel"
@@ -3845,11 +4418,15 @@ buckets {
     # The 10.xx version translates to which bots will run isolated tests.
     builders { mixins: "mac-try" name: "mac_chromium_10.10" }
     builders { mixins: "mac-try" name: "mac_chromium_10.12_rel_ng" }
-    builders { mixins: "mac-try" name: "mac_chromium_10.13_rel_ng"}
+    builders {
+      mixins: "mac-try"
+      mixins: "goma-rbe-prod"
+      name: "mac_chromium_10.13_rel_ng"
+    }
     builders { mixins: "mac-try" name: "mac_chromium_archive_rel_ng" }
     builders {
       mixins: "mac-try"
-      mixins: "goma-j150"
+      mixins: "goma-rbe-prod-j150"
       name: "mac_chromium_asan_rel_ng"
     }
     builders {
@@ -3865,7 +4442,11 @@ buckets {
       mixins: "goma-j150"
       name: "mac-rel"
     }
-    builders { mixins: "mac-dawn-try" name: "mac-dawn-rel" }
+    builders {
+      mixins: "mac-dawn-try"
+      mixins: "goma-rbe-prod"
+      name: "mac-dawn-rel"
+    }
     builders {
       mixins: "mac-optional-gpu-try"
       name: "mac_optional_gpu_tests_rel"
@@ -3877,6 +4458,7 @@ buckets {
       mixins: "upload_clang"
       mixins: "xcode-mac-9a235"
       name: "mac_upload_clang"
+      execution_timeout_secs: 21600  # 6h
     }
 
     builders { mixins: "win-dawn-try" name: "dawn-win10-x64-deps-rel" }
@@ -3884,6 +4466,10 @@ buckets {
 
     builders {
       mixins: "win-optional-gpu-try"
+      name: "gpu-fyi-try-win-xr-builder"
+    }
+    builders {
+      mixins: "win-optional-gpu-try"
       name: "gpu-fyi-try-win7-amd-dbg"
     }
     builders {
@@ -3997,56 +4583,70 @@ buckets {
 
     builders {
       name: "android_compile_x86_dbg"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "android-try"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "linux-annotator-rel"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "linux-try"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "linux_vr"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "linux-try"
       mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "android_compile_rel"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "android-try"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "linux_android_dbg_ng"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "android-try"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "android_compile_x64_dbg"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "android-try"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "android_archive_rel_ng"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "android-try"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "layout_test_leak_detection"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "linux-try"
       mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "android_cfi_rel_ng"
-      dimensions: "os:Ubuntu-14.04"
       dimensions: "cores:32"
       mixins: "android-try"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "android_mojo"
-      dimensions: "os:Ubuntu-14.04"
       mixins: "android-try"
+      mixins: "goma-rbe-prod"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
 
     # Blink try builders.
@@ -4054,6 +4654,8 @@ buckets {
       name: "linux-blink-rel"
       mixins: "linux"
       mixins: "blink-try"
+      mixins: "linux-xenial"
+      mixins: "builderless"
     }
     builders {
       name: "mac10.10-blink-rel"
@@ -4079,6 +4681,7 @@ buckets {
       name: "mac10.13_retina-blink-rel"
       mixins: "mac"
       mixins: "blink-try"
+      mixins: "goma-rbe-prod"
     }
     builders {
       name: "win10-blink-rel"
@@ -4090,6 +4693,11 @@ buckets {
       mixins: "win"
       mixins: "blink-try"
     }
+    builders {
+      name: "win-celab-try-rel"
+      mixins: "celab-try"
+      mixins: "win-try"
+    }
   }
 }
 
@@ -4122,22 +4730,40 @@ buckets {
 
     # Android
 
-    builders { mixins: "linux-xenial"  name: "WebRTC Chromium Android Builder" }
-    builders { mixins: "linux-xenial"  name: "WebRTC Chromium Android Tester" }
+    builders {
+      name: "WebRTC Chromium Android Builder"
+      mixins: "linux-xenial"
+      mixins: "goma-rbe-prod"
+    }
+    builders {
+      name: "WebRTC Chromium Android Tester"
+      mixins: "linux-xenial"
+    }
 
     # Linux
 
-    builders { mixins: "linux-xenial"  name: "WebRTC Chromium Linux Builder" }
-    builders { mixins: "linux"  name: "WebRTC Chromium Linux Tester" }
+    builders {
+      name: "WebRTC Chromium Linux Builder"
+      mixins: "linux-xenial"
+      mixins: "goma-rbe-prod"
+    }
+    builders {
+      name: "WebRTC Chromium Linux Tester"
+      mixins: "linux"
+    }
 
     # Mac
 
     builders {
       name: "WebRTC Chromium Mac Builder"
       mixins: "mac"
+      mixins: "goma-rbe-prod"
       dimensions: "cores:8"
     }
-    builders { mixins: "mac"  name: "WebRTC Chromium Mac Tester" }
+    builders {
+      name: "WebRTC Chromium Mac Tester"
+      mixins: "mac"
+    }
 
     # Win
 
@@ -4175,9 +4801,9 @@ buckets {
 
     # Android
 
-    builders { mixins: "linux-xenial"  name: "WebRTC Chromium FYI Android Builder" }
-    builders { mixins: "linux-xenial"  name: "WebRTC Chromium FYI Android Builder (dbg)" }
-    builders { mixins: "linux-xenial"  name: "WebRTC Chromium FYI Android Builder ARM64 (dbg)" }
+    builders { mixins: "linux-xenial" mixins: "goma-rbe-prod" name: "WebRTC Chromium FYI Android Builder" }
+    builders { mixins: "linux-xenial" mixins: "goma-rbe-prod" name: "WebRTC Chromium FYI Android Builder (dbg)" }
+    builders { mixins: "linux-xenial" mixins: "goma-rbe-prod" name: "WebRTC Chromium FYI Android Builder ARM64 (dbg)" }
     builders { mixins: "linux-xenial"  name: "WebRTC Chromium FYI Android Tests (dbg) (K Nexus5)" }
     builders { mixins: "linux-xenial"  name: "WebRTC Chromium FYI Android Tests (dbg) (M Nexus5X)" }
 
@@ -4188,8 +4814,8 @@ buckets {
 
     # Linux
 
-    builders { mixins: "linux-xenial"  name: "WebRTC Chromium FYI Linux Builder" }
-    builders { mixins: "linux-xenial"  name: "WebRTC Chromium FYI Linux Builder (dbg)" }
+    builders { mixins: "linux-xenial" mixins: "goma-rbe-prod" name: "WebRTC Chromium FYI Linux Builder" }
+    builders { mixins: "linux-xenial" mixins: "goma-rbe-prod" name: "WebRTC Chromium FYI Linux Builder (dbg)" }
     builders { mixins: "linux-xenial"  name: "WebRTC Chromium FYI Linux Tester" }
 
     # Mac
@@ -4197,21 +4823,43 @@ buckets {
     builders {
       name: "WebRTC Chromium FYI Mac Builder"
       mixins: "mac"
+      mixins: "goma-rbe-prod"
       dimensions: "cores:8"
     }
     builders {
       name: "WebRTC Chromium FYI Mac Builder (dbg)"
       mixins: "mac"
+      mixins: "goma-rbe-prod"
       dimensions: "cores:8"
     }
     builders { mixins: "mac"  name: "WebRTC Chromium FYI Mac Tester" }
 
     # Win
 
-    builders { mixins: "win" name: "WebRTC Chromium FYI Win Builder" }
-    builders { mixins: "win" name: "WebRTC Chromium FYI Win Builder (dbg)" }
-    builders { mixins: "win" name: "WebRTC Chromium FYI Win10 Tester" }
-    builders { mixins: "win" name: "WebRTC Chromium FYI Win7 Tester" }
-    builders { mixins: "win" name: "WebRTC Chromium FYI Win8 Tester" }
+    builders {
+      name: "WebRTC Chromium FYI Win Builder"
+      mixins: "win"
+      dimensions: "os:Windows-10"
+    }
+    builders {
+      name: "WebRTC Chromium FYI Win Builder (dbg)"
+      mixins: "win"
+      dimensions: "os:Windows-10"
+    }
+    builders {
+      name: "WebRTC Chromium FYI Win10 Tester"
+      mixins: "win"
+      dimensions: "os:Windows-10"
+    }
+    builders {
+      name: "WebRTC Chromium FYI Win7 Tester"
+      mixins: "win"
+      dimensions: "os:Windows-7"
+    }
+    builders {
+      name: "WebRTC Chromium FYI Win8 Tester"
+      mixins: "win"
+      dimensions: "os:Windows-8.1"
+    }
   }
 }
diff --git a/chromium/infra/config/lint-luci-milo.py b/chromium/infra/config/lint-luci-milo.py
index 5ca1484baba..71964236b5d 100755
--- a/chromium/infra/config/lint-luci-milo.py
+++ b/chromium/infra/config/lint-luci-milo.py
@@ -72,8 +72,8 @@ def main():
   # Check that every referenced subwaterfall has its own console, unless it's
   # explicitly excluded below.
   excluded_names = [
-      # This is the chrome/chromium.chrome console in src-internal.
-      'chromium.chrome',
+      # This is the chrome console in src-internal.
+      'chrome',
   ]
   all_console_names = [console.id for console in project.consoles]
   referenced_names = set(subwaterfalls.keys())
diff --git a/chromium/infra/config/luci-milo.cfg b/chromium/infra/config/luci-milo.cfg
index 5cebe061a9b..aebc5cb9b77 100644
--- a/chromium/infra/config/luci-milo.cfg
+++ b/chromium/infra/config/luci-milo.cfg
@@ -130,11 +130,6 @@ headers {
       alt: "Chromium Android console"
     }
     links {
-      text: "chromedriver"
-      url: "/p/chromium/g/chromium.chromedriver"
-      alt: "Chromium Chromedriver console"
-    }
-    links {
       text: "dawn"
       url: "/p/chromium/g/chromium.dawn"
       alt: "Chromium Dawn console"
@@ -194,7 +189,7 @@ headers {
     }
     links {
       text: "chrome"
-      url: "/p/chrome/g/tryserver.chromium.chrome/builders"
+      url: "/p/chrome/g/tryserver.chrome/builders"
       alt: "Chrome"
     }
     links {
@@ -241,7 +236,7 @@ headers {
     console_ids: "chromium/chromium.mac"
     console_ids: "chromium/chromium.linux"
     console_ids: "chromium/chromium.chromiumos"
-    console_ids: "chrome/chromium.chrome"
+    console_ids: "chrome/chrome"
     console_ids: "chromium/chromium.memory"
     console_ids: "chromium/chromium.gpu"
   }
@@ -541,6 +536,11 @@ consoles {
     short_name: "ozo"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/linux-trusty-rel"
+    category: "chromium.linux|release"
+    short_name: "tru"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)(32)"
     category: "chromium.linux|debug|builder"
     short_name: "32"
@@ -556,11 +556,6 @@ consoles {
     short_name: "det"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)(32)"
-    category: "chromium.linux|debug|tester"
-    short_name: "32"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)"
     category: "chromium.linux|debug|tester"
     short_name: "64"
@@ -637,22 +632,22 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chrome.ci/linux-chromeos-google-rel"
-    category: "chromium.chrome"
+    category: "chrome"
     short_name: "cro"
   }
   builders {
     name: "buildbucket/luci.chrome.ci/linux-google-rel"
-    category: "chromium.chrome"
+    category: "chrome"
     short_name: "lnx"
   }
   builders {
     name: "buildbucket/luci.chrome.ci/mac-google-rel"
-    category: "chromium.chrome"
+    category: "chrome"
     short_name: "mac"
   }
   builders {
     name: "buildbucket/luci.chrome.ci/win-google-rel"
-    category: "chromium.chrome"
+    category: "chrome"
     short_name: "win"
   }
   builders {
@@ -750,6 +745,11 @@ consoles {
     short_name: "tst"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/android-asan"
+    category: "chromium.memory|android"
+    short_name: "asn"
+  }
+  builders {
     name: "buildbot/chromium.memory/Android CFI"
     name: "buildbucket/luci.chromium.ci/Android CFI"
     category: "chromium.memory|cfi"
@@ -959,6 +959,11 @@ consoles {
     short_name: "ozo"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/linux-trusty-rel"
+    category: "release"
+    short_name: "tru"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)(32)"
     category: "debug|builder"
     short_name: "32"
@@ -974,11 +979,6 @@ consoles {
     short_name: "det"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)(32)"
-    category: "debug|tester"
-    short_name: "32"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)"
     category: "debug|tester"
     short_name: "64"
@@ -1166,6 +1166,11 @@ consoles {
     short_name: "tst"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/android-asan"
+    category: "android"
+    short_name: "asn"
+  }
+  builders {
     name: "buildbot/chromium.memory/Android CFI"
     name: "buildbucket/luci.chromium.ci/Android CFI"
     category: "cfi"
@@ -1558,22 +1563,22 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Android WebView L (dbg)"
-    category: "webview"
+    category: "tester|webview"
     short_name: "L"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Android WebView M (dbg)"
-    category: "webview"
+    category: "tester|webview"
     short_name: "M"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Android WebView N (dbg)"
-    category: "webview"
+    category: "tester|webview"
     short_name: "N"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Android WebView O (dbg)"
-    category: "webview"
+    category: "tester|webview"
     short_name: "O"
   }
   builders {
@@ -1597,6 +1602,11 @@ consoles {
     category: "on_cq"
     short_name: "san"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-oreo-arm64-rel"
+    category: "on_cq|future"
+    short_name: "O"
+  }
 }
 
 consoles {
@@ -1617,30 +1627,6 @@ consoles {
 
 consoles {
   header_id: "chromium"
-  id: "chromium.chromedriver"
-  name: "chromium.chromedriver"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbot/chromium.chromedriver/Linux"
-    name: "buildbucket/luci.chromium.ci/Linux"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Linux32"
-  }
-  builders {
-    name: "buildbot/chromium.chromedriver/Mac 10.6"
-    name: "buildbucket/luci.chromium.ci/Mac 10.6"
-  }
-  builders {
-    name: "buildbot/chromium.chromedriver/Win7"
-    name: "buildbucket/luci.chromium.ci/Win7"
-  }
-}
-
-consoles {
-  header_id: "chromium"
   id: "chromium.clang"
   name: "chromium.clang"
   repo_url: "https://chromium.googlesource.com/chromium/src"
@@ -2049,6 +2035,11 @@ consoles {
     category: "closure_compilation"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/android-code-coverage"
+    category: "code_coverage"
+    short_name: "and"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/linux-code-coverage"
     category: "code_coverage"
     short_name: "lnx"
@@ -2103,10 +2094,6 @@ consoles {
     short_name: "jmb"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Chromium Mac 10.13"
-    category: "default"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/Mac deterministic"
     category: "deterministic"
   }
@@ -2268,15 +2255,15 @@ consoles {
     short_name: "VF"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Linux ARM"
+    name: "buildbucket/luci.chromium.ci/VR Linux"
     category: "linux"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/VR Linux"
+    name: "buildbucket/luci.chromium.ci/linux-fieldtrial-rel"
     category: "linux"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/linux-tcmalloc-rel"
+    name: "buildbucket/luci.chromium.ci/linux-wpt-fyi-rel"
     category: "linux"
   }
   builders {
@@ -2349,6 +2336,22 @@ consoles {
     name: "buildbucket/luci.chromium.ci/Win 10 Fast Ring"
     category: "win10"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-pixel-builder-rel"
+    category: "win10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-pixel-tester-rel"
+    category: "win10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-celab-builder-rel"
+    category: "celab"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-celab-tester-rel"
+    category: "celab"
+  }
 }
 
 consoles {
@@ -2613,10 +2616,6 @@ consoles {
   manifest_name: "REVISION"
   include_experimental_builds: true
   builders {
-    name: "buildbucket/luci.chromium.ci/Linux ARM"
-    category: "week1|linux|arm"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/VR Linux"
     category: "week1|linux"
     short_name: "vr"
@@ -2669,6 +2668,412 @@ consoles {
     category: "week1|linux|webkit"
     short_name: "msan"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 32 Vk Release (Pixel 2)"
+    category: "week2a|android|32"
+    short_name: "p2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 32 dEQP Vk Release (Pixel 2)"
+    category: "week2a|android|32deqp"
+    short_name: "p2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 64 Vk Release (Pixel 2)"
+    category: "week2a|android|64"
+    short_name: "p2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 64 dEQP Vk Release (Pixel 2)"
+    category: "week2a|android|64deqp"
+    short_name: "p2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (NVIDIA Shield TV)"
+    category: "week2a|android|rel"
+    short_name: "shdtv"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 5)"
+    category: "week2a|android|rel"
+    short_name: "n5"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 5X)"
+    category: "week2a|android|rel"
+    short_name: "n5x"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 6)"
+    category: "week2a|android|rel"
+    short_name: "n6"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 6P)"
+    category: "week2a|android|rel"
+    short_name: "n6p"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 9)"
+    category: "week2a|android|rel"
+    short_name: "n9"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Pixel 2)"
+    category: "week2a|android|rel"
+    short_name: "p2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI eDQP Release (Nexus 5X)"
+    category: "week2a|android|edqp"
+    short_name: "n5x"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Android"
+    category: "week2a|android|det"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Android (dbg)"
+    category: "week2a|android|det"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder"
+    category: "week2b|android|release"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder (dbg)"
+    category: "week2b|android|debug|builder"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder ARM64 (dbg)"
+    category: "week2b|android|debug|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Linux Builder"
+    category: "week2b|linux|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Linux Builder (dbg)"
+    category: "week2b|linux|debug"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Mac Builder"
+    category: "week2b|mac|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Mac Builder (dbg)"
+    category: "week2b|mac|debug"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Android Builder"
+    category: "week2b|android"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Linux Builder"
+    category: "week2b|linux"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Mac Builder"
+    category: "week2b|mac"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac ASAN Release"
+    category: "week2c|mac|asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac ASAN Release Media"
+    category: "week2c|mac|asan"
+    short_name: "media"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac ASan 64 Builder"
+    category: "week2c|mac|asan"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Mac ASan"
+    category: "week2c|mac|asan"
+    short_name: "fuzz"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/WebKit Mac10.13 (retina)"
+    category: "week2c|mac"
+    short_name: "webkit"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android CFI"
+    category: "week2c|android"
+    short_name: "cfi"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Site Isolation Android"
+    category: "week2c|android"
+    short_name: "isolate"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mojo Android"
+    category: "week2c|android"
+    short_name: "mojo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android x64 Builder (dbg)"
+    category: "week2c|android|dbg"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android x86 Builder (dbg)"
+    category: "week2c|android|dbg"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView L (dbg)"
+    category: "week2c|android|dbg|webview"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView M (dbg)"
+    category: "week2c|android|dbg|webview"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView N (dbg)"
+    category: "week2c|android|dbg|webview"
+    short_name: "n"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView O (dbg)"
+    category: "week2c|android|dbg|webview"
+    short_name: "o"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView O NetworkService (dbg)"
+    category: "week2c|android|dbg|webview"
+    short_name: "o net"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 Builder"
+    category: "week2d|linux|dawn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Builder"
+    category: "week2d|linux|dawn"
+    short_name: "deps"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux Builder"
+    category: "week2d|linux|gpu|fyi"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux Builder (dbg)"
+    category: "week2d|linux|gpu|fyi"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux Ozone Builder"
+    category: "week2d|linux|gpu|fyi"
+    short_name: "ozone"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux eDQP Builder"
+    category: "week2d|linux|gpu|fyi"
+    short_name: "edqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI GPU TSAN Release"
+    category: "week2d|linux|gpu|fyi"
+    short_name: "tsan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Linux Builder (dbg)"
+    category: "week2d|linux|gpu"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Viz"
+    category: "week2d|linux"
+    short_name: "viz"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux remote_run Builder"
+    category: "week2d|linux"
+    short_name: "rem"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Closure Compilation Linux"
+    category: "week2d|linux"
+    short_name: "clsr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux"
+    category: "week2d|linux|det"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux (dbg)"
+    category: "week2d|linux|det"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Jumbo Linux x64"
+    category: "week2d|linux"
+    short_name: "jumbo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 Builder"
+    category: "week2d|mac|dawn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Builder"
+    category: "week2d|mac|dawn"
+    short_name: "deps"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Mac Builder"
+    category: "week2d|mac|gpu|fyi"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Mac Builder (dbg)"
+    category: "week2d|mac|gpu|fyi"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Mac eDQP Builder"
+    category: "week2d|mac|gpu|fyi"
+    short_name: "edqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac FYI GPU ASAN Release"
+    category: "week2d|mac|gpu|fyi"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Mac Builder (dbg)"
+    category: "week2d|mac|gpu"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac deterministic"
+    category: "week2d|mac|det"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac deterministic (dbg)"
+    category: "week2d|mac|det"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Jumbo Mac"
+    category: "week2d|mac"
+    short_name: "jumbo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Builder"
+    category: "week2.5|linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Linux Builder"
+    category: "week2.5|linux"
+    short_name: "gpu"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux ASan"
+    category: "week4|linux"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux ASan Debug"
+    category: "week4|linux"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux MSan"
+    category: "week4|linux"
+    short_name: "msan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux UBSan"
+    category: "week4|linux"
+    short_name: "ubsan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux V8-ARM64 ASan"
+    category: "week4|linux|v8arm"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux V8-ARM64 ASan Debug"
+    category: "week4|linux|v8arm"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux32 ASan"
+    category: "week4|linux32"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux32 ASan Debug"
+    category: "week4|linux32"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux32 V8-ARM ASan"
+    category: "week4|linux32|v8arm"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux32 V8-ARM ASan Debug"
+    category: "week4|linux32|v8arm"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASan Debug (32-bit x86 with V8-ARM)"
+    category: "week5|asan"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASan Release (32-bit x86 with V8-ARM)"
+    category: "week5|asan"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASan Release Media (32-bit x86 with V8-ARM)"
+    category: "week5|asan"
+    short_name: "media"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASAN Debug"
+    category: "week6|asan"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASAN Release"
+    category: "week6|asan"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASAN Release Media"
+    category: "week6|asan"
+    short_name: "media"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/MSAN Release (chained origins)"
+    category: "week7|msan"
+    short_name: "chain"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/MSAN Release (no origins)"
+    category: "week7|msan"
+    short_name: "none"
+  }
 }
 
 consoles {
@@ -2735,7 +3140,6 @@ consoles {
     category: "Linux"
   }
   builders {
-    name: "buildbot/chromium.gpu/Android Release (Nexus 5X)"
     name: "buildbucket/luci.chromium.ci/Android Release (Nexus 5X)"
     category: "Android"
   }
@@ -2839,11 +3243,6 @@ consoles {
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Win10 FYI Exp LinuxVM Testing (NVIDIA)"
-    category: "Windows|10|Nvidia"
-    short_name: "lvm"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/Win10 FYI Exp Release (NVIDIA)"
     category: "Windows|10|Nvidia"
     short_name: "exp"
@@ -2986,7 +3385,7 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.ci/Linux FYI Experimental Release (Intel HD 630)"
     category: "Linux|Intel"
-    short_name: "rel"
+    short_name: "exp"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Linux FYI Release (Intel HD 630)"
@@ -3074,23 +3473,13 @@ consoles {
     short_name: "P2"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Android FYI 32 Vk Release (Pixel XL)"
-    category: "Android|vk|P32"
-    short_name: "PXL"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Android FYI 64 Vk Release (Pixel XL)"
-    category: "Android|vk|P64"
-    short_name: "PXL"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/Android FYI 32 Vk Release (Pixel 2)"
-    category: "Android|vk|P32"
+    category: "Android|vk|Q32"
     short_name: "P2"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Android FYI 64 Vk Release (Pixel 2)"
-    category: "Android|vk|P64"
+    category: "Android|vk|Q64"
     short_name: "P2"
   }
   builders {
@@ -3099,23 +3488,18 @@ consoles {
     short_name: "N5X"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Android FYI 32 dEQP Vk Release (Pixel XL)"
-    category: "Android|dqp|vk|P32"
-    short_name: "PXL"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Android FYI 64 dEQP Vk Release (Pixel XL)"
-    category: "Android|dqp|vk|P64"
-    short_name: "PXL"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/Android FYI 32 dEQP Vk Release (Pixel 2)"
-    category: "Android|dqp|vk|P32"
+    category: "Android|dqp|vk|Q32"
     short_name: "P2"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Android FYI 64 dEQP Vk Release (Pixel 2)"
-    category: "Android|dqp|vk|P64"
+    category: "Android|dqp|vk|Q64"
+    short_name: "P2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI SkiaRenderer Vulkan (Pixel 2)"
+    category: "Android|skv|P32"
     short_name: "P2"
   }
 }
@@ -3251,45 +3635,6 @@ consoles {
 
 consoles {
   header_id: "chromium"
-  id: "chromium.tools.build"
-  name: "chromium.tools.build"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbot/chromium.tools.build/build-repo-real-try_mac"
-    name: "buildbucket/luci.chromium.ci/build-repo-real-try_mac"
-    category: "real-try"
-  }
-  builders {
-    name: "buildbot/chromium.tools.build/build-repo-real-try_trusty64"
-    name: "buildbucket/luci.chromium.ci/build-repo-real-try_trusty64"
-    category: "real-try"
-  }
-  builders {
-    name: "buildbot/chromium.tools.build/build-repo-real-try_win64"
-    name: "buildbucket/luci.chromium.ci/build-repo-real-try_win64"
-    category: "real-try"
-  }
-  builders {
-    name: "buildbot/chromium.tools.build/recipe-simulation_mac"
-    name: "buildbucket/luci.chromium.ci/recipe-simulation_mac"
-    category: "simulation"
-  }
-  builders {
-    name: "buildbot/chromium.tools.build/recipe-simulation_trusty64"
-    name: "buildbucket/luci.chromium.ci/recipe-simulation_trusty64"
-    category: "simulation"
-  }
-  builders {
-    name: "buildbot/chromium.tools.build/v8-linux-end-to-end"
-    name: "buildbucket/luci.chromium.ci/v8-linux-end-to-end"
-    category: "v8"
-  }
-}
-
-consoles {
-  header_id: "chromium"
   id: "chromium.webrtc"
   name: "chromium.webrtc"
   repo_url: "https://chromium.googlesource.com/chromium/src"
@@ -3711,6 +4056,9 @@ consoles {
     name: "buildbucket/luci.chromium.try/android-marshmallow-arm64-rel"
   }
   builders {
+    name: "buildbucket/luci.chromium.try/android-oreo-arm64-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android_optional_gpu_tests_rel"
   }
   builders {
@@ -3747,37 +4095,34 @@ consoles {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-32-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-skv-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-32-deqp-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-deqp-vk-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-64-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-deqp-vk-64"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-64-deqp-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-vk-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-xl-32-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-vk-64"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-xl-32-deqp-vk"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-xl-64-vk"
+    name: "buildbucket/luci.chromium.try/android-deterministic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-xl-64-deqp-vk"
+    name: "buildbucket/luci.chromium.try/android-deterministic-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/android-deterministic-rel"
+    name: "buildbucket/luci.chromium.try/try-nougat-phone-tester"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/android-deterministic-dbg"
+    name: "buildbucket/luci.chromium.try/android-oreo-arm64-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/try-nougat-phone-tester"
+    name: "buildbucket/luci.chromium.try/android-pie-arm64-dbg"
   }
   builder_view_only: true
 }
@@ -3875,6 +4220,9 @@ consoles {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-rel"
   }
   builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-skv"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-tsn"
   }
   builders {
@@ -3893,12 +4241,6 @@ consoles {
     name: "buildbucket/luci.chromium.try/linux-gcc-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/linux-goma-rbe-prod-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux-goma-rbe-staging-rel"
-  }
-  builders {
     name: "buildbucket/luci.chromium.try/linux-libfuzzer-asan-rel"
   }
   builders {
@@ -3908,6 +4250,9 @@ consoles {
     name: "buildbucket/luci.chromium.try/linux-rel"
   }
   builders {
+    name: "buildbucket/luci.chromium.try/linux-trusty-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_arm"
   }
   builders {
@@ -3938,9 +4283,6 @@ consoles {
     name: "buildbucket/luci.chromium.try/linux_chromium_component_updater"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_dbg_32_ng"
-  }
-  builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_msan_rel_ng"
   }
   builders {
@@ -4142,6 +4484,9 @@ consoles {
   refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win-xr-builder"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-amd-dbg"
   }
   builders {
@@ -4342,6 +4687,9 @@ consoles {
     name: "buildbucket/luci.chromium.try/android-oreo-arm64-cts-networkservice-dbg"
   }
   builders {
+    name: "buildbucket/luci.chromium.try/android-oreo-arm64-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android_archive_rel_ng"
   }
   builders {
@@ -4405,9 +4753,6 @@ consoles {
     name: "buildbucket/luci.chromium.try/chromeos-kevin-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/chromium_devtools"
-  }
-  builders {
     name: "buildbucket/luci.chromium.try/chromium_presubmit"
   }
   builders {
@@ -4438,28 +4783,19 @@ consoles {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-32-vk"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-32-deqp-vk"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-64-vk"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-64-deqp-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-skv-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-xl-32-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-deqp-vk-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-xl-32-deqp-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-deqp-vk-64"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-xl-64-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-vk-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-xl-64-deqp-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-vk-64"
   }
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-intel-dqp"
@@ -4483,9 +4819,15 @@ consoles {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-rel"
   }
   builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-skv"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-tsn"
   }
   builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win-xr-builder"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-amd-dbg"
   }
   builders {
@@ -4651,9 +4993,6 @@ consoles {
     name: "buildbucket/luci.chromium.try/linux-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_dbg_32_ng"
-  }
-  builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_dbg_ng"
   }
   builders {
@@ -4753,6 +5092,12 @@ consoles {
     name: "buildbucket/luci.chromium.try/try-nougat-phone-tester"
   }
   builders {
+    name: "buildbucket/luci.chromium.try/android-oreo-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-pie-arm64-dbg"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/win7-rel"
   }
   builders {
@@ -4803,6 +5148,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/win_x64_archive"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-celab-try-rel"
+  }
   builder_view_only: true
 }
 
diff --git a/chromium/infra/config/luci-notify.cfg b/chromium/infra/config/luci-notify.cfg
index 79207f87805..b6ab8939afd 100644
--- a/chromium/infra/config/luci-notify.cfg
+++ b/chromium/infra/config/luci-notify.cfg
@@ -203,7 +203,9 @@ notifiers {
   notifications {
     on_change: true
     email {
-      recipients: "cronet-sheriff@google.com"
+      recipients: "cronet-sheriff-oncall1@google.com"
+      recipients: "cronet-sheriff-oncall2@google.com"
+      recipients: "cronet-sheriff+bot@google.com"
     }
   }
   builders {
diff --git a/chromium/infra/config/luci-scheduler.cfg b/chromium/infra/config/luci-scheduler.cfg
index a01b1591ad2..8ee0c4a0cac 100644
--- a/chromium/infra/config/luci-scheduler.cfg
+++ b/chromium/infra/config/luci-scheduler.cfg
@@ -72,13 +72,9 @@ trigger {
   triggers: "Android Builder (dbg) Goma Latest Client"
   triggers: "Android CFI"
   triggers: "Android FYI 32 Vk Release (Pixel 2)"
-  triggers: "Android FYI 32 Vk Release (Pixel XL)"
   triggers: "Android FYI 32 dEQP Vk Release (Pixel 2)"
-  triggers: "Android FYI 32 dEQP Vk Release (Pixel XL)"
   triggers: "Android FYI 64 Vk Release (Pixel 2)"
-  triggers: "Android FYI 64 Vk Release (Pixel XL)"
   triggers: "Android FYI 64 dEQP Vk Release (Pixel 2)"
-  triggers: "Android FYI 64 dEQP Vk Release (Pixel XL)"
   triggers: "Android FYI Release (NVIDIA Shield TV)"
   triggers: "Android FYI Release (Nexus 5)"
   triggers: "Android FYI Release (Nexus 5X)"
@@ -86,6 +82,7 @@ trigger {
   triggers: "Android FYI Release (Nexus 6P)"
   triggers: "Android FYI Release (Nexus 9)"
   triggers: "Android FYI Release (Pixel 2)"
+  triggers: "Android FYI SkiaRenderer Vulkan (Pixel 2)"
   triggers: "Android FYI dEQP Release (Nexus 5X)"
   triggers: "Android Release (Nexus 5X)"
   triggers: "Android arm Builder (dbg)"
@@ -116,7 +113,6 @@ trigger {
   triggers: "Chromium Linux Goma RBE ToT"
   triggers: "Chromium Linux Goma RBE ToT (ATS)"
   triggers: "Chromium Linux Goma Staging"
-  triggers: "Chromium Mac 10.13"
   triggers: "Chromium Mac Goma RBE Prod"
   triggers: "Chromium Mac Goma RBE Staging"
   triggers: "Chromium Mac Goma RBE Staging (clobber)"
@@ -188,7 +184,6 @@ trigger {
   triggers: "Libfuzzer Upload Linux UBSan"
   triggers: "Libfuzzer Upload Mac ASan"
   triggers: "Libfuzzer Upload Windows ASan"
-  triggers: "Linux ARM"
   triggers: "Linux ASan LSan Builder"
   triggers: "Linux ASan LSan Builder (Goma RBE FYI)"
   triggers: "Linux Builder (dbg)"
@@ -299,6 +294,7 @@ trigger {
   triggers: "WinMSVC64 Goma Latest Client"
   triggers: "Windows deterministic"
   triggers: "android-asan"
+  triggers: "android-code-coverage"
   triggers: "android-cronet-arm-dbg"
   triggers: "android-cronet-arm-rel"
   triggers: "android-cronet-arm64-dbg"
@@ -313,6 +309,7 @@ trigger {
   triggers: "android-kitkat-arm-rel"
   triggers: "android-marshmallow-arm64-rel"
   triggers: "android-mojo-webview-rel"
+  triggers: "android-oreo-arm64-rel"
   triggers: "android-archive-rel"
   triggers: "chromeos-amd64-generic-asan-rel"
   triggers: "chromeos-amd64-generic-cfi-thin-lto-rel"
@@ -324,7 +321,6 @@ trigger {
   triggers: "chromeos-arm-generic-rel"
   triggers: "chromeos-kevin-rel"
   triggers: "chromeos-kevin-rel-hw-tests"
-  triggers: "chromeos-vm-code-coverage"
   triggers: "fuchsia-fyi-arm64-rel"
   triggers: "fuchsia-fyi-arm64-rel (Goma RBE FYI)"
   triggers: "fuchsia-fyi-x64-dbg"
@@ -349,7 +345,6 @@ trigger {
   triggers: "linux-blink-animation-use-time-delta"
   triggers: "linux-blink-heap-concurrent-marking-tsan-rel"
   triggers: "linux-blink-heap-verification"
-  triggers: "linux-chromeos-code-coverage"
   triggers: "linux-chromeos-dbg"
   triggers: "linux-chromeos-oobe-code-coverage"
   triggers: "linux-chromeos-rel"
@@ -360,7 +355,9 @@ trigger {
   triggers: "linux-jumbo-rel"
   triggers: "linux-ozone-rel"
   triggers: "linux-archive-rel"
-  triggers: "linux-tcmalloc-rel"
+  triggers: "linux-fieldtrial-rel"
+  triggers: "linux-wpt-fyi-rel"
+  triggers: "linux-trusty-rel"
   triggers: "linux-win_cross-rel"
   triggers: "mac-code-coverage-generation"
   triggers: "mac-archive-dbg"
@@ -377,6 +374,8 @@ trigger {
   triggers: "win-archive-dbg"
   triggers: "win-jumbo-rel"
   triggers: "win-archive-rel"
+  triggers: "win-celab-builder-rel"
+  triggers: "win-pixel-builder-rel"
   triggers: "win32-arm64-rel"
   triggers: "win32-archive-dbg"
   triggers: "win32-archive-rel"
@@ -455,16 +454,6 @@ job {
 }
 
 job {
-  id: "Android FYI 32 dEQP Vk Release (Pixel XL)"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android FYI 32 dEQP Vk Release (Pixel XL)"
-  }
-}
-
-job {
   id: "Android FYI 32 Vk Release (Pixel 2)"
   acl_sets: "default"
   buildbucket: {
@@ -475,16 +464,6 @@ job {
 }
 
 job {
-  id: "Android FYI 32 Vk Release (Pixel XL)"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android FYI 32 Vk Release (Pixel XL)"
-  }
-}
-
-job {
   id: "Android FYI 64 dEQP Vk Release (Pixel 2)"
   acl_sets: "default"
   buildbucket: {
@@ -495,16 +474,6 @@ job {
 }
 
 job {
-  id: "Android FYI 64 dEQP Vk Release (Pixel XL)"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android FYI 64 dEQP Vk Release (Pixel XL)"
-  }
-}
-
-job {
   id: "Android FYI 64 Vk Release (Pixel 2)"
   acl_sets: "default"
   buildbucket: {
@@ -515,16 +484,6 @@ job {
 }
 
 job {
-  id: "Android FYI 64 Vk Release (Pixel XL)"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android FYI 64 Vk Release (Pixel XL)"
-  }
-}
-
-job {
   id: "Android FYI dEQP Release (Nexus 5X)"
   acl_sets: "default"
   buildbucket: {
@@ -605,6 +564,16 @@ job {
 }
 
 job {
+  id: "Android FYI SkiaRenderer Vulkan (Pixel 2)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI SkiaRenderer Vulkan (Pixel 2)"
+  }
+}
+
+job {
   id: "Android Release (Nexus 5X)"
   acl_sets: "default"
   buildbucket: {
@@ -700,6 +669,16 @@ job {
 }
 
 job {
+  id: "android-code-coverage"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-code-coverage"
+  }
+}
+
+job {
   id: "android-cronet-arm-dbg"
   acl_sets: "default"
   buildbucket: {
@@ -863,6 +842,16 @@ job {
 }
 
 job {
+  id: "android-oreo-arm64-rel"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-oreo-arm64-rel"
+  }
+}
+
+job {
   id: "Cast Android (dbg)"
   acl_sets: "default"
   buildbucket: {
@@ -1799,6 +1788,26 @@ job {
 }
 
 job {
+  id: "linux-fieldtrial-rel"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-fieldtrial-rel"
+  }
+}
+
+job {
+  id: "linux-wpt-fyi-rel"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-wpt-fyi-rel"
+  }
+}
+
+job {
   id: "Linux ASan LSan Builder"
   acl_sets: "default"
   buildbucket: {
@@ -1861,17 +1870,6 @@ job {
   }
 }
 
-# Triggered by "Linux Builder (dbg)(32)"
-job {
-  id: "Linux Tests (dbg)(1)(32)"
-  acl_sets: "triggered-by-parent-builders"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Linux Tests (dbg)(1)(32)"
-  }
-}
-
 job {
   id: "Linux Builder"
   acl_sets: "default"
@@ -1925,6 +1923,16 @@ job {
 }
 
 job {
+  id: "linux-trusty-rel"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-trusty-rel"
+  }
+}
+
+job {
   id: "WebRTC Chromium Linux Builder"
   acl_sets: "default"
   acl_sets: "webrtc"
@@ -2694,17 +2702,6 @@ job {
 }
 
 job {
-  id: "Win10 FYI Exp LinuxVM Testing (NVIDIA)"
-  # Triggered by "GPU FYI Win Builder"
-  acl_sets: "triggered-by-parent-builders"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Win10 FYI Exp LinuxVM Testing (NVIDIA)"
-  }
-}
-
-job {
   id: "Win10 FYI Exp Release (Intel HD 630)"
   # Triggered by "GPU FYI Win Builder"
   acl_sets: "triggered-by-parent-builders"
@@ -3075,6 +3072,48 @@ job {
 }
 
 job {
+  id: "win-celab-builder-rel"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-celab-builder-rel"
+  }
+}
+
+job {
+  id: "win-celab-tester-rel"
+  # Triggered by "win-celab-builder-rel"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-celab-tester-rel"
+  }
+}
+
+job {
+  id: "win-pixel-builder-rel"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-pixel-builder-rel"
+  }
+}
+
+job {
+  id: "win-pixel-tester-rel"
+  # Triggered by "win-pixel-builder-rel"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-pixel-tester-rel"
+  }
+}
+
+job {
   id: "Win Builder"
   acl_sets: "default"
   buildbucket: {
@@ -3297,16 +3336,6 @@ job {
 }
 
 job {
-  id: "Chromium Mac 10.13"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Chromium Mac 10.13"
-  }
-}
-
-job {
   id: "ChromiumOS ASAN Release"
   acl_sets: "default"
   buildbucket: {
@@ -3556,26 +3585,6 @@ job {
 }
 
 job {
-  id: "Linux"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Linux"
-  }
-}
-
-job {
-  id: "Linux ARM"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Linux ARM"
-  }
-}
-
-job {
   id: "Linux Builder Goma Canary"
   acl_sets: "default"
   buildbucket: {
@@ -3786,16 +3795,6 @@ job {
 }
 
 job {
-  id: "Mac 10.6"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Mac 10.6"
-  }
-}
-
-job {
   id: "Mac ASAN Release"
   acl_sets: "default"
   buildbucket: {
@@ -4098,16 +4097,6 @@ job {
 }
 
 job {
-  id: "linux-tcmalloc-rel"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "linux-tcmalloc-rel"
-  }
-}
-
-job {
   id: "WebKit Linux ASAN"
   acl_sets: "default"
   buildbucket: {
@@ -4326,16 +4315,6 @@ job {
 }
 
 job {
-  id: "Win7"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Win7"
-  }
-}
-
-job {
   id: "Win7 Builder (dbg) Goma Canary"
   acl_sets: "default"
   buildbucket: {
diff --git a/chromium/infra/config/tricium-prod.cfg b/chromium/infra/config/tricium-prod.cfg
index 6a82b500faa..88027e27aea 100644
--- a/chromium/infra/config/tricium-prod.cfg
+++ b/chromium/infra/config/tricium-prod.cfg
@@ -25,6 +25,11 @@ selections {
 }
 
 selections {
+  function: "MojomCommentator"
+  platform: UBUNTU
+}
+
+selections {
   function: "SpellChecker"
   platform: UBUNTU
 }