BASELINE: Update Chromium to 75.0.3770.56

Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

9 files changed, 1873 insertions, 778 deletions

diff --git a/chromium/infra/OWNERS b/chromium/infra/OWNERS
index e0c773c959d..0b3da093ad7 100644
--- a/chromium/infra/OWNERS
+++ b/chromium/infra/OWNERS
@@ -1,6 +1,14 @@
-iannucci@chromium.org
-sergiyb@chromium.org
+# This is reserved for people that are comfortable with Chromium builders
+# and understand the implications of changing their configurations.
+
+bpastene@chromium.org
 dpranke@chromium.org
+hans@chromium.org
+iannucci@chromium.org
+jbudorick@chromium.org
+kbr@chromium.org
+martiniss@chromium.org
+thakis@chromium.org
 
-per-file recipe*=recipe-roller@chromium.org
-per-file recipe*=martiniss@chromium.org
+# TEAM: infra-dev@chromium.org
+# COMPONENT: Infra>Client>Chrome
diff --git a/chromium/infra/config/OWNERS b/chromium/infra/config/OWNERS
index 8f8363a690a..31a321e33b5 100644
--- a/chromium/infra/config/OWNERS
+++ b/chromium/infra/config/OWNERS
@@ -1,24 +1,9 @@
-set noparent
-bpastene@chromium.org
-dpranke@chromium.org
-estaab@chromium.org
-hans@chromium.org
-hinoka@chromium.org
-iannucci@chromium.org
-jbudorick@chromium.org
-jchinlee@chromium.org
-martiniss@chromium.org
-maruel@chromium.org
-smut@google.com
-tandrii@chromium.org
-thakis@chromium.org
-vadimsh@chromium.org
-
 # 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
 per-file cr-buildbucket.cfg=yyanagisawa@chromium.org
+
 # TEAM: infra-dev@chromium.org
 # COMPONENT: Infra>Client>Chrome
diff --git a/chromium/infra/config/commit-queue.cfg b/chromium/infra/config/commit-queue.cfg
index e17e658b4ac..c49fe441380 100644
--- a/chromium/infra/config/commit-queue.cfg
+++ b/chromium/infra/config/commit-queue.cfg
@@ -178,6 +178,7 @@ config_groups {
         location_regexp: ".+/[+]/services/viz/.+"
         location_regexp: ".+/[+]/testing/trigger_scripts/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
         location_regexp: ".+/[+]/ui/gl/.+"
       }
       builders {
@@ -185,10 +186,46 @@ config_groups {
         location_regexp: ".+/[+]/chromeos/CHROMEOS_LKGM"
       }
       builders {
+        name: "chromium/try/chromeos-kevin-rel"
+        location_regexp: ".+/[+]/build/chromeos/.+"
+      }
+      builders {
         name: "chromium/try/closure_compilation"
         location_regexp: ".+/[+]/third_party/closure_compiler/.+"
       }
       builders {
+        name: "chromium/try/dawn-linux-x64-deps-rel"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/dawn/.+"
+      }
+      builders {
+        name: "chromium/try/dawn-mac-x64-deps-rel"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/dawn/.+"
+      }
+      builders {
+        name: "chromium/try/dawn-win10-x64-deps-rel"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/dawn/.+"
+      }
+      builders {
+        name: "chromium/try/dawn-win10-x86-deps-rel"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/dawn/.+"
+      }
+      builders {
         name: "chromium/try/ios-simulator-cronet"
         location_regexp: ".+/[+]/components/cronet/.+"
         location_regexp: ".+/[+]/components/grpc_support/.+"
@@ -211,7 +248,6 @@ config_groups {
       builders {
         name: "chromium/try/linux_chromium_dbg_ng"
         location_regexp: ".+/[+]/build/.*check_gn_headers.*"
-        location_regexp: ".+/[+]/chrome/browser/resources/.+"
       }
       builders {
         name: "chromium/try/linux_layout_tests_composite_after_paint"
@@ -248,6 +284,7 @@ config_groups {
         location_regexp: ".+/[+]/media/gpu/.+"
         location_regexp: ".+/[+]/testing/trigger_scripts/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
         location_regexp: ".+/[+]/ui/gl/.+"
       }
       builders {
@@ -265,6 +302,7 @@ config_groups {
         location_regexp: ".+/[+]/services/shape_detection/.+"
         location_regexp: ".+/[+]/testing/trigger_scripts/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
         location_regexp: ".+/[+]/ui/gl/.+"
       }
       builders {
@@ -307,11 +345,6 @@ config_groups {
         name: "chromium/try/linux-coverage-rel"
         experiment_percentage: 10
       }
-      # https://crbug.com/833482
-      builders {
-        name: "chromium/try/linux-dcheck-off-rel"
-        experiment_percentage: 10
-      }
       # https://crbug.com/855319
       builders {
         name: "chromium/try/linux-goma-rbe-staging-rel"
diff --git a/chromium/infra/config/cr-buildbucket.cfg b/chromium/infra/config/cr-buildbucket.cfg
index 1daa26e1163..0fee7801690 100644
--- a/chromium/infra/config/cr-buildbucket.cfg
+++ b/chromium/infra/config/cr-buildbucket.cfg
@@ -111,6 +111,30 @@ builder_mixins {
   }
 }
 
+# This is for load testing of the execution backend.
+builder_mixins {
+  name: "goma-j1000"
+  recipe {
+    properties_j: <<END
+    $build/goma: {
+      "jobs": 1000
+    }
+    END
+  }
+}
+
+# This is for load testing of the execution backend.
+builder_mixins {
+  name: "goma-j2000"
+  recipe {
+    properties_j: <<END
+    $build/goma: {
+      "jobs": 2000
+    }
+    END
+  }
+}
+
 # This is for 4 cores mac. -j40 is too small, especially for clobber builder.
 builder_mixins {
   name: "goma-j80"
@@ -123,6 +147,18 @@ builder_mixins {
   }
 }
 
+# This is to enable Arbitrary Toolchain Support for Goma in a builder.
+builder_mixins {
+  name: "goma-ats"
+  recipe {
+    properties_j: <<END
+    $build/goma: {
+      "enable_ats": true
+    }
+    END
+  }
+}
+
 builder_mixins {
   name: "android"
   dimensions: "os:Android"
@@ -180,20 +216,15 @@ builder_mixins {
   name: "android-gpu-fyi-ci"
   dimensions: "os:Ubuntu-14.04"
   mixins: "gpu-fyi-ci"
-}
-
-builder_mixins {
-  name: "android-gpu-manual-try"
-  mixins: "android-optional-gpu-try"
-  # Increase timeout to allow tryjobs against small number of phones.
   mixins: "gpu-slow-bot"
 }
 
 builder_mixins {
   name: "android-optional-gpu-try"
   dimensions: "os:Ubuntu-14.04"
-  mixins: "gpu-optional-try"
   mixins: "android-try"
+  mixins: "gpu-optional-try"
+  mixins: "gpu-slow-bot"
 }
 
 builder_mixins {
@@ -277,11 +308,31 @@ builder_mixins {
 }
 
 builder_mixins {
+  name: "dawn-ci"
+  service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  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 {
   name: "dawn-try"
   service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
   recipe {
     properties: "mastername:tryserver.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 {
@@ -351,6 +402,12 @@ builder_mixins {
 }
 
 builder_mixins {
+  name: "linux-dawn-ci"
+  mixins: "linux"
+  mixins: "dawn-ci"
+}
+
+builder_mixins {
   name: "linux-dawn-try"
   mixins: "linux"
   mixins: "dawn-try"
@@ -366,11 +423,9 @@ builder_mixins {
 
 builder_mixins {
   name: "linux-optional-gpu-try"
-  mixins: "linux"
+  mixins: "linux-try"
   mixins: "gpu-optional-try"
-  recipe {
-    properties: "mastername:tryserver.chromium.linux"
-  }
+  mixins: "gpu-slow-bot"
 }
 
 builder_mixins {
@@ -382,6 +437,12 @@ builder_mixins {
 }
 
 builder_mixins {
+  name: "mac-dawn-ci"
+  mixins: "mac"
+  mixins: "dawn-ci"
+}
+
+builder_mixins {
   name: "memory-ci"
   mixins: "goma-many-jobs-for-ci"
   recipe {
@@ -404,12 +465,25 @@ builder_mixins {
   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"
   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 {
@@ -431,7 +505,6 @@ builder_mixins {
   name: "mac-angle-try"
   mixins: "mac"
   mixins: "angle-try"
-  dimensions: "cores:4"
 }
 
 builder_mixins {
@@ -442,11 +515,8 @@ builder_mixins {
 
 builder_mixins {
   name: "mac-optional-gpu-try"
-  mixins: "mac"
+  mixins: "mac-try"
   mixins: "gpu-optional-try"
-  recipe {
-    properties: "mastername:tryserver.chromium.mac"
-  }
 }
 
 builder_mixins {
@@ -536,11 +606,9 @@ builder_mixins {
 
 builder_mixins {
   name: "win-optional-gpu-try"
-  mixins: "win"
+  mixins: "win-try"
   mixins: "gpu-optional-try"
-  recipe {
-    properties: "mastername:tryserver.chromium.win"
-  }
+  mixins: "gpu-slow-bot"
 }
 
 builder_mixins {
@@ -560,6 +628,12 @@ builder_mixins {
 }
 
 builder_mixins {
+  name: "win-dawn-ci"
+  mixins: "win"
+  mixins: "dawn-ci"
+}
+
+builder_mixins {
   name: "win-dawn-try"
   mixins: "win"
   mixins: "dawn-try"
@@ -586,6 +660,12 @@ builder_mixins {
   mixins: "win"
   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 {
@@ -605,6 +685,12 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "builderless"
+  auto_builder_dimension: NO
+  dimensions: "builderless:1"
+}
+
 buckets {
   name: "ci"
   acl_sets: "ci"
@@ -637,6 +723,7 @@ buckets {
     builders {
       name: "Android arm Builder (dbg)"
       mixins: "android-ci"
+      mixins: "builderless"
       dimensions: "os:Ubuntu-14.04"
       execution_timeout_secs: 14400  # 4h
     }
@@ -644,6 +731,7 @@ buckets {
     builders {
       name: "Android arm64 Builder (dbg)"
       mixins: "android-ci"
+      mixins: "builderless"
       mixins: "goma-many-jobs-for-ci"
       dimensions: "os:Ubuntu-14.04"
       execution_timeout_secs: 14400  # 4h
@@ -662,79 +750,43 @@ buckets {
     }
 
     builders {
-      name: "Android FYI 32 dEQP Vk Release (Nexus 5X)"
-      mixins: "android-gpu-fyi-ci"
-    }
-
-    builders {
       name: "Android FYI 32 dEQP Vk Release (Pixel 2)"
       mixins: "android-gpu-fyi-ci"
-      # Increase timeout to allow tryjobs against small number of phones.
-      mixins: "gpu-slow-bot"
     }
 
     builders {
       name: "Android FYI 32 dEQP Vk Release (Pixel XL)"
       mixins: "android-gpu-fyi-ci"
-      # Increase timeout to allow tryjobs against small number of phones.
-      mixins: "gpu-slow-bot"
-    }
-
-    builders {
-      name: "Android FYI 32 Vk Release (Nexus 5X)"
-      mixins: "android-gpu-fyi-ci"
     }
 
     builders {
       name: "Android FYI 32 Vk Release (Pixel 2)"
       mixins: "android-gpu-fyi-ci"
-      # Increase timeout to allow tryjobs against small number of phones.
-      mixins: "gpu-slow-bot"
     }
 
     builders {
       name: "Android FYI 32 Vk Release (Pixel XL)"
       mixins: "android-gpu-fyi-ci"
-      # Increase timeout to allow tryjobs against small number of phones.
-      mixins: "gpu-slow-bot"
-    }
-
-    builders {
-      name: "Android FYI 64 dEQP Vk Release (Nexus 5X)"
-      mixins: "android-gpu-fyi-ci"
     }
 
     builders {
       name: "Android FYI 64 dEQP Vk Release (Pixel 2)"
       mixins: "android-gpu-fyi-ci"
-      # Increase timeout to allow tryjobs against small number of phones.
-      mixins: "gpu-slow-bot"
     }
 
     builders {
       name: "Android FYI 64 dEQP Vk Release (Pixel XL)"
       mixins: "android-gpu-fyi-ci"
-      # Increase timeout to allow tryjobs against small number of phones.
-      mixins: "gpu-slow-bot"
-    }
-
-    builders {
-      name: "Android FYI 64 Vk Release (Nexus 5X)"
-      mixins: "android-gpu-fyi-ci"
     }
 
     builders {
       name: "Android FYI 64 Vk Release (Pixel 2)"
       mixins: "android-gpu-fyi-ci"
-      # Increase timeout to allow tryjobs against small number of phones.
-      mixins: "gpu-slow-bot"
     }
 
     builders {
       name: "Android FYI 64 Vk Release (Pixel XL)"
       mixins: "android-gpu-fyi-ci"
-      # Increase timeout to allow tryjobs against small number of phones.
-      mixins: "gpu-slow-bot"
     }
 
     builders {
@@ -745,8 +797,6 @@ buckets {
     builders {
       name: "Android FYI Release (Nexus 5)"
       mixins: "android-gpu-fyi-ci"
-      # Increase timeout to allow tryjobs against small number of phones.
-      mixins: "gpu-slow-bot"
     }
 
     builders {
@@ -757,29 +807,26 @@ buckets {
     builders {
       name: "Android FYI Release (Nexus 6)"
       mixins: "android-gpu-fyi-ci"
-      # Increase timeout to allow tryjobs against small number of phones.
-      mixins: "gpu-slow-bot"
     }
 
     builders {
       name: "Android FYI Release (Nexus 6P)"
       mixins: "android-gpu-fyi-ci"
-      # Increase timeout to allow tryjobs against small number of phones.
-      mixins: "gpu-slow-bot"
     }
 
     builders {
       name: "Android FYI Release (Nexus 9)"
       mixins: "android-gpu-fyi-ci"
-      # Increase timeout to allow tryjobs against small number of phones.
-      mixins: "gpu-slow-bot"
     }
 
     builders {
       name: "Android FYI Release (NVIDIA Shield TV)"
       mixins: "android-gpu-fyi-ci"
-      # Increase timeout to allow tryjobs against small number of phones.
-      mixins: "gpu-slow-bot"
+    }
+
+    builders {
+      name: "Android FYI Release (Pixel 2)"
+      mixins: "android-gpu-fyi-ci"
     }
 
     builders {
@@ -802,36 +849,42 @@ buckets {
     builders {
       name: "Android WebView L (dbg)"
       mixins: "android-ci"
+      mixins: "builderless"
       dimensions: "os:Ubuntu-14.04"
     }
 
     builders {
       name: "Android WebView M (dbg)"
       mixins: "android-ci"
+      mixins: "builderless"
       dimensions: "os:Ubuntu-14.04"
     }
 
     builders {
       name: "Android WebView N (dbg)"
       mixins: "android-ci"
+      mixins: "builderless"
       dimensions: "os:Ubuntu-14.04"
     }
 
     builders {
       name: "Android WebView O (dbg)"
       mixins: "android-ci"
+      mixins: "builderless"
       dimensions: "os:Ubuntu-14.04"
     }
 
     builders {
       name: "Android WebView O NetworkService (dbg)"
       mixins: "android-fyi-ci"
+      mixins: "builderless"
       dimensions: "os:Ubuntu-14.04"
     }
 
     builders {
       name: "Android x64 Builder (dbg)"
       mixins: "android-ci"
+      mixins: "builderless"
       dimensions: "os:Ubuntu-14.04"
       execution_timeout_secs: 14400  # 4h
     }
@@ -839,6 +892,7 @@ buckets {
     builders {
       name: "Android x86 Builder (dbg)"
       mixins: "android-ci"
+      mixins: "builderless"
       dimensions: "os:Ubuntu-14.04"
     }
 
@@ -1009,6 +1063,12 @@ buckets {
 
     # ChromeOS bots.
     builders {
+      name: "chromeos-amd64-generic-asan-rel"
+      mixins: "chromeos-ci"
+      mixins: "builderless"
+    }
+
+    builders {
       name: "chromeos-amd64-generic-cfi-thin-lto-rel"
       mixins: "chromeos-ci"
     }
@@ -1029,6 +1089,7 @@ buckets {
       mixins: "code-coverage"
       mixins: "fyi-ci"
       mixins: "linux"
+      dimensions: "cores:32"
     }
 
     builders {
@@ -1048,6 +1109,14 @@ buckets {
     }
 
     builders {
+      name: "linux-chromeos-code-coverage"
+      mixins: "code-coverage"
+      mixins: "fyi-ci"
+      mixins: "linux"
+      dimensions: "cores:32"
+    }
+
+    builders {
       name: "linux-chromeos-dbg"
       mixins: "chromeos-ci"
     }
@@ -1125,6 +1194,11 @@ buckets {
       name: "Deterministic Linux (dbg)"
       mixins: "deterministic"
       mixins: "linux-ci"
+
+      # This builder does local build, so needs large number of cores.
+      dimensions: "cores:32"
+
+      auto_builder_dimension: NO
     }
 
     builders {
@@ -1168,9 +1242,10 @@ buckets {
     }
 
     builders {
-      name: "linux-blink-heap-incremental-marking"
+      name: "linux-blink-heap-concurrent-marking-tsan-rel"
       mixins: "fyi-ci"
       mixins: "linux"
+      mixins: "builderless"
     }
 
     builders {
@@ -1308,7 +1383,6 @@ buckets {
 
     builders {
       name: "Linux FYI Experimental Release (Intel HD 630)"
-      mixins: "gpu-slow-bot"
       mixins: "linux-gpu-fyi-ci"
     }
 
@@ -1333,6 +1407,11 @@ buckets {
     }
 
     builders {
+      name: "Linux FYI SkiaRenderer Vulkan (NVIDIA)"
+      mixins: "linux-gpu-fyi-ci"
+    }
+
+    builders {
       name: "Linux FYI Release (Intel HD 630)"
       mixins: "linux-gpu-fyi-ci"
     }
@@ -1350,7 +1429,6 @@ buckets {
     builders {
       name: "Linux FYI Release (AMD R7 240)"
       mixins: "linux-gpu-fyi-ci"
-      mixins: "gpu-slow-bot"
     }
 
     builders {
@@ -1379,12 +1457,14 @@ buckets {
     builders {
       name: "Mac10.10 Tests"
       mixins: "mac-ci"
-      dimensions:"os:Mac-10.10"
+      # The build runs on 10.13, but triggers tests on 10.10 bots.
+      dimensions:"os:Mac-10.13"
     }
     builders {
       name: "Mac10.11 Tests"
       mixins: "mac-ci"
-      dimensions:"os:Mac-10.11"
+      # The build runs on 10.13, but triggers tests on 10.11 bots.
+      dimensions:"os:Mac-10.13"
     }
     builders {
       name: "Mac10.12 Tests"
@@ -1406,21 +1486,20 @@ 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.
     builders {
       name: "GPU Mac Builder"
       mixins: "mac-gpu-ci"
     }
     builders {
       name: "Mac Release (Intel)"
-      mixins: "mac-gpu-ci"
-      # TODO(tandrii,kbr): this builder doesn't actually run tests locally,
-      # and so can perhaps run on cheaper linux hardware.
+      mixins: "linux-gpu-ci"
     }
     builders {
       name: "Mac Retina Release (AMD)"
-      mixins: "mac-gpu-ci"
-      # TODO(tandrii,kbr): this builder doesn't actually run tests locally,
-      # and so can perhaps run on cheaper linux hardware.
+      mixins: "linux-gpu-ci"
     }
 
     builders {
@@ -1429,15 +1508,11 @@ buckets {
     }
     builders {
       name: "Mac Debug (Intel)"
-      mixins: "mac-gpu-ci"
-      # TODO(tandrii,kbr): this builder doesn't actually run tests locally,
-      # and so can perhaps run on cheaper linux hardware.
+      mixins: "linux-gpu-ci"
     }
     builders {
       name: "Mac Retina Debug (AMD)"
-      mixins: "mac-gpu-ci"
-      # TODO(tandrii,kbr): this builder doesn't actually run tests locally,
-      # and so can perhaps run on cheaper linux hardware.
+      mixins: "linux-gpu-ci"
     }
 
     # chromium.gpu.fyi
@@ -1453,61 +1528,64 @@ buckets {
       name: "GPU FYI Mac dEQP Builder"
       mixins: "mac-gpu-fyi-ci"
     }
+    # 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.
     builders {
       name: "Mac FYI 10.14 Release (AMD)"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
       mixins: "gpu-slow-bot"
     }
     builders {
       name: "Mac FYI 10.14 Release (Intel)"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
       mixins: "gpu-slow-bot"
     }
     builders {
       name: "Mac FYI 10.14 Release (NVIDIA)"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
       mixins: "gpu-slow-bot"
     }
     builders {
       name: "Mac FYI Release (Intel)"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
     }
     builders {
       name: "Mac FYI Debug (Intel)"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
     }
     builders {
       name: "Mac Pro FYI Release (AMD)"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
       mixins: "gpu-slow-bot"
     }
     builders {
       name: "Mac FYI Retina Release (NVIDIA)"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
     }
     builders {
       name: "Mac FYI Retina Debug (NVIDIA)"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
     }
     builders {
       name: "Mac FYI Retina Release (AMD)"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
     }
     builders {
       name: "Mac FYI Retina Debug (AMD)"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
     }
     builders {
       name: "Mac FYI Experimental Release (Intel)"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
     }
     builders {
       name: "Mac FYI Experimental Retina Release (AMD)"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
     }
     builders {
       name: "Mac FYI Experimental Retina Release (NVIDIA)"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
       # 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.
@@ -1515,16 +1593,17 @@ buckets {
     }
     builders {
       name: "Mac FYI GPU ASAN Release"
+      # Builder/tester, thus needs Mac (not Linux like testers-only)
       mixins: "mac-gpu-fyi-ci"
       execution_timeout_secs: 14400  # 4h
     }
     builders {
       name: "Mac FYI dEQP Release AMD"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
     }
     builders {
       name: "Mac FYI dEQP Release Intel"
-      mixins: "mac-gpu-fyi-ci"
+      mixins: "linux-gpu-fyi-ci"
     }
 
     # iOS bots.
@@ -1671,6 +1750,7 @@ buckets {
       name: "ToTAndroidASan"
       mixins: "clang-ci"
       mixins: "linux"
+      dimensions: "os:" #needed to target dedicated HW
     }
     builders {
       name: "ToTAndroidCFI"
@@ -1888,6 +1968,10 @@ buckets {
       mixins: "win-gpu-fyi-ci"
     }
     builders {
+      name: "Win10 FYI Release (AMD RX 550)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
       name: "Win7 FYI Debug (AMD)"
       mixins: "win-gpu-fyi-ci"
     }
@@ -1911,9 +1995,124 @@ buckets {
       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"
+    }
+
+    # chromium.dawn
+    builders {
+      name: "Dawn Linux x64 Builder"
+      mixins: "linux-dawn-ci"
+    }
+    builders {
+      name: "Dawn Linux x64 Release (Intel HD 630)"
+      mixins: "linux-dawn-ci"
+    }
+    builders {
+      name: "Dawn Linux x64 Release (NVIDIA)"
+      mixins: "linux-dawn-ci"
+    }
+    builders {
+      name: "Dawn Linux x64 DEPS Builder"
+      mixins: "linux-dawn-ci"
+    }
+    builders {
+      name: "Dawn Linux x64 DEPS Release (Intel HD 630)"
+      mixins: "linux-dawn-ci"
+    }
+    builders {
+      name: "Dawn Linux x64 DEPS Release (NVIDIA)"
+      mixins: "linux-dawn-ci"
+    }
+    builders {
+      name: "Dawn Mac x64 Builder"
+      mixins: "mac-dawn-ci"
+    }
+    builders {
+      name: "Dawn Mac x64 DEPS Builder"
+      mixins: "mac-dawn-ci"
+    }
+    # 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.
+    builders {
+      name: "Dawn Mac x64 Release (AMD)"
+      mixins: "linux-dawn-ci"
+    }
+    builders {
+      name: "Dawn Mac x64 Release (Intel)"
+      mixins: "linux-dawn-ci"
+    }
+    builders {
+      name: "Dawn Mac x64 DEPS Release (AMD)"
+      mixins: "linux-dawn-ci"
+    }
+    builders {
+      name: "Dawn Mac x64 DEPS Release (Intel)"
+      mixins: "linux-dawn-ci"
+    }
+    builders {
+      name: "Dawn Win10 x86 Builder"
+      mixins: "win-dawn-ci"
+    }
+    builders {
+      name: "Dawn Win10 x64 Builder"
+      mixins: "win-dawn-ci"
+    }
+    builders {
+      name: "Dawn Win10 x86 Release (Intel HD 630)"
+      mixins: "win-dawn-ci"
+    }
+    builders {
+      name: "Dawn Win10 x64 Release (Intel HD 630)"
+      mixins: "win-dawn-ci"
+    }
+    builders {
+      name: "Dawn Win10 x86 Release (NVIDIA)"
+      mixins: "win-dawn-ci"
+    }
+    builders {
+      name: "Dawn Win10 x64 Release (NVIDIA)"
+      mixins: "win-dawn-ci"
+    }
+    builders {
+      name: "Dawn Win10 x86 DEPS Builder"
+      mixins: "win-dawn-ci"
+    }
+    builders {
+      name: "Dawn Win10 x64 DEPS Builder"
+      mixins: "win-dawn-ci"
+    }
+    builders {
+      name: "Dawn Win10 x86 DEPS Release (Intel HD 630)"
+      mixins: "win-dawn-ci"
+    }
+    builders {
+      name: "Dawn Win10 x64 DEPS Release (Intel HD 630)"
+      mixins: "win-dawn-ci"
+    }
+    builders {
+      name: "Dawn Win10 x86 DEPS Release (NVIDIA)"
+      mixins: "win-dawn-ci"
+    }
+    builders {
+      name: "Dawn Win10 x64 DEPS Release (NVIDIA)"
+      mixins: "win-dawn-ci"
+    }
+
 
     # Code coverage reports generation bots.
     builders {
+      name: "ios-simulator-code-coverage"
+      mixins: "code-coverage"
+      mixins: "ios"
+      dimensions: "cores:"
+    }
+
+    builders {
       name: "linux-code-coverage"
       mixins: "code-coverage"
       dimensions: "cores:32"
@@ -1976,12 +2175,6 @@ buckets {
       mixins: "android-fyi-ci"
     }
     builders {
-      name: "Mac ASAN Debug"
-      dimensions: "os:Mac-10.13"
-      dimensions: "cores:4"
-      mixins: "fuzz-ci"
-    }
-    builders {
       name: "Libfuzzer Upload Linux MSan"
       dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
@@ -2039,11 +2232,6 @@ buckets {
       mixins: "fuzz-ci"
     }
     builders {
-      name: "Android VR Tests"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "fyi-ci"
-    }
-    builders {
       name: "ChromiumOS ASAN Release"
       dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
@@ -2100,11 +2288,6 @@ buckets {
       mixins: "android-ci"
     }
     builders {
-      name: "Android Remoting Tests"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "fyi-ci"
-    }
-    builders {
       name: "ASan Debug (32-bit x86 with V8-ARM)"
       dimensions: "os:Ubuntu-14.04"
       mixins: "fuzz-ci"
@@ -2346,16 +2529,6 @@ buckets {
       mixins: "android-ci"
     }
     builders {
-      name: "Linux Clang Analyzer"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "fyi-ci"
-    }
-    builders {
-      name: "Android Builder (dbg)"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "fyi-ci"
-    }
-    builders {
       name: "chromeos-amd64-generic-rel-goma-canary"
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
@@ -2388,11 +2561,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
     }
     builders {
-      name: "Android Find Annotated Test"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "fyi-ci"
-    }
-    builders {
       name: "Mojo ChromiumOS"
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
@@ -2455,14 +2623,6 @@ buckets {
       mixins: "android-fyi-ci"
     }
     builders {
-      name: "Chromium Windows Analyze"
-      dimensions: "os:Windows-10"
-      mixins: "fyi-ci"
-      recipe {
-        name: "win_analyze"
-      }
-    }
-    builders {
       name: "ios-device-goma-canary-clobber"
       dimensions: "os:Mac-10.13"
       dimensions: "cores:4"
@@ -2518,175 +2678,315 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
     }
-    # Goma Staging
+    # Goma RBE ToT/Staging/FYI
     builders {
-      name: "Chromium Linux Goma RBE Staging (dbg)"
+      name: "Chromium Linux Goma RBE ToT"
       dimensions: "os:Ubuntu-14.04"
-      mixins: "goma-ci"
       mixins: "experimental"
+      mixins: "goma-ci"
     }
     builders {
-      name: "CrWinGomaStaging"
-      dimensions: "os:Windows-10"
-      mixins: "goma-ci"
+      name: "Chromium Linux Goma RBE ToT (ATS)"
+      dimensions: "os:Ubuntu-14.04"
       mixins: "experimental"
+      mixins: "goma-ats"
+      mixins: "goma-ci"
     }
     builders {
-      name: "Chromium Linux Goma RBE ToT"
+      name: "Chromium Linux Goma RBE Staging"
       dimensions: "os:Ubuntu-14.04"
+      mixins: "experimental"
       mixins: "goma-ci"
+    }
+    builders {
+      name: "Chromium Linux Goma RBE Staging (clobber)"
+      dimensions: "os:Ubuntu-14.04"
       mixins: "experimental"
+      mixins: "goma-ci"
     }
     builders {
-      name: "Chromium Linux Goma RBE ToT (ATS)"
+      name: "Chromium Linux Goma RBE Staging (dbg)"
       dimensions: "os:Ubuntu-14.04"
+      mixins: "experimental"
       mixins: "goma-ci"
+    }
+    builders {
+      name: "Chromium Linux Goma RBE Staging (dbg) (clobber)"
+      dimensions: "os:Ubuntu-14.04"
       mixins: "experimental"
+      mixins: "goma-ci"
     }
     builders {
-      name: "Chromium Linux Goma RBE Staging"
+      name: "Chromium Linux Goma RBE Prod"
       dimensions: "os:Ubuntu-14.04"
+      mixins: "experimental"
       mixins: "goma-ci"
+    }
+    builders {
+      name: "Chromium Linux Goma RBE Prod (clobber)"
+      dimensions: "os:Ubuntu-14.04"
       mixins: "experimental"
+      mixins: "goma-ci"
     }
     builders {
-      name: "Chromium Linux Goma RBE Staging (clobber)"
+      name: "Chromium Linux Goma RBE Prod (dbg)"
       dimensions: "os:Ubuntu-14.04"
+      mixins: "experimental"
       mixins: "goma-ci"
+    }
+    builders {
+      name: "Chromium Linux Goma RBE Prod (dbg) (clobber)"
+      dimensions: "os:Ubuntu-14.04"
       mixins: "experimental"
+      mixins: "goma-ci"
     }
     builders {
-      name: "Chromium Linux Goma RBE Prod"
+      name: "Chromium Linux Goma RBE LoadTest"
       dimensions: "os:Ubuntu-14.04"
+      mixins: "experimental"
       mixins: "goma-ci"
+      mixins: "goma-j300"
+    }
+    builders {
+      name: "Chromium Linux Goma RBE LoadTest (debug)"
+      dimensions: "os:Ubuntu-14.04"
       mixins: "experimental"
+      mixins: "goma-ci"
+      mixins: "goma-j300"
     }
     builders {
-      name: "Chromium Linux Goma RBE Prod (clobber)"
+      name: "Chromium Linux Goma RBE LoadTest (clobber)"
       dimensions: "os:Ubuntu-14.04"
+      mixins: "experimental"
       mixins: "goma-ci"
+      mixins: "goma-j300"
+    }
+    builders {
+      name: "Chromium Linux Goma RBE LoadTest (clobber) (debug)"
+      dimensions: "os:Ubuntu-14.04"
       mixins: "experimental"
+      mixins: "goma-ci"
+      mixins: "goma-j300"
     }
     builders {
-      name: "Chromium Linux Goma RBE Prod (dbg)"
+      name: "Chromium Linux Goma RBE LoadTest (ATS)"
       dimensions: "os:Ubuntu-14.04"
+      mixins: "experimental"
+      mixins: "goma-ats"
       mixins: "goma-ci"
+    }
+    builders {
+      name: "Chromium Linux Goma RBE LoadTest (ATS) (debug)"
+      dimensions: "os:Ubuntu-14.04"
       mixins: "experimental"
+      mixins: "goma-ats"
+      mixins: "goma-ci"
     }
     builders {
-      name: "Chromium Linux Goma RBE Prod (dbg) (clobber)"
+      name: "Chromium Linux Goma RBE LoadTest (ATS) (clobber)"
       dimensions: "os:Ubuntu-14.04"
+      mixins: "experimental"
+      mixins: "goma-ats"
       mixins: "goma-ci"
+    }
+    builders {
+      name: "Chromium Linux Goma RBE LoadTest (ATS) (clobber) (debug)"
+      dimensions: "os:Ubuntu-14.04"
       mixins: "experimental"
+      mixins: "goma-ats"
+      mixins: "goma-ci"
     }
     builders {
       name: "Chromium Mac Goma RBE ToT"
       dimensions: "os:Mac-10.13"
       dimensions: "cores:4"
-      mixins: "goma-ci"
       mixins: "experimental"
+      mixins: "goma-ci"
+      mixins: "goma-j80"
     }
     builders {
       name: "Chromium Mac Goma RBE Staging (clobber)"
       dimensions: "os:Mac-10.13"
       dimensions: "cores:4"
+      mixins: "experimental"
       mixins: "goma-ci"
       mixins: "goma-j80"
-      mixins: "experimental"
     }
     builders {
       name: "Chromium Mac Goma RBE Staging"
       dimensions: "os:Mac-10.13"
       dimensions: "cores:4"
+      mixins: "experimental"
       mixins: "goma-ci"
       mixins: "goma-j80"
-      mixins: "experimental"
     }
     builders {
       name: "Chromium Mac Goma RBE Staging (dbg)"
       dimensions: "os:Mac-10.13"
       dimensions: "cores:4"
+      mixins: "experimental"
       mixins: "goma-ci"
       mixins: "goma-j80"
-      mixins: "experimental"
     }
     builders {
       name: "Chromium Win Goma RBE ToT"
       dimensions: "os:Windows-10"
-      mixins: "goma-ci"
       mixins: "experimental"
+      mixins: "goma-ats"
+      mixins: "goma-ci"
     }
     builders {
       name: "Chromium Win Goma RBE Staging"
       dimensions: "os:Windows-10"
-      mixins: "goma-ci"
       mixins: "experimental"
+      mixins: "goma-ats"
+      mixins: "goma-ci"
     }
     builders {
       name: "Chromium Win Goma RBE Staging (clobber)"
       dimensions: "os:Windows-10"
-      mixins: "goma-ci"
       mixins: "experimental"
+      mixins: "goma-ats"
+      mixins: "goma-ci"
     }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE ToT"
       dimensions: "os:Ubuntu-14.04"
-      mixins: "goma-ci"
       mixins: "experimental"
+      mixins: "goma-ci"
     }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE ToT (ATS)"
       dimensions: "os:Ubuntu-14.04"
-      mixins: "goma-ci"
       mixins: "experimental"
+      mixins: "goma-ats"
+      mixins: "goma-ci"
     }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE Staging"
       dimensions: "os:Ubuntu-14.04"
-      mixins: "goma-ci"
       mixins: "experimental"
+      mixins: "goma-ci"
     }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE Prod"
       dimensions: "os:Ubuntu-14.04"
-      mixins: "goma-ci"
       mixins: "experimental"
+      mixins: "goma-ci"
     }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE Prod (clobber)"
       dimensions: "os:Ubuntu-14.04"
-      mixins: "goma-ci"
       mixins: "experimental"
+      mixins: "goma-ci"
     }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE Prod (dbg)"
       dimensions: "os:Ubuntu-14.04"
-      mixins: "goma-ci"
       mixins: "experimental"
+      mixins: "goma-ci"
     }
     builders {
       name: "Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)"
       dimensions: "os:Ubuntu-14.04"
+      mixins: "experimental"
       mixins: "goma-ci"
+    }
+    builders {
+      name: "Chromium Android ARM 32-bit Goma RBE LoadTest"
+      dimensions: "os:Ubuntu-14.04"
       mixins: "experimental"
+      mixins: "goma-ci"
+      mixins: "goma-j300"
     }
     builders {
-      name: "Chromium Linux Goma RBE Staging (dbg) (clobber)"
+      name: "Chromium Android ARM 32-bit Goma RBE LoadTest (debug)"
       dimensions: "os:Ubuntu-14.04"
+      mixins: "experimental"
       mixins: "goma-ci"
+      mixins: "goma-j300"
+    }
+    builders {
+      name: "Chromium Android ARM 32-bit Goma RBE LoadTest (clobber)"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "experimental"
+      mixins: "goma-ci"
+      mixins: "goma-j300"
+    }
+    builders {
+      name: "Chromium Android ARM 32-bit Goma RBE LoadTest (clobber) (debug)"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "experimental"
+      mixins: "goma-ci"
+      mixins: "goma-j300"
+    }
+    # Goma RBE FYI
+    builders {
+      name: "Cast Linux (Goma RBE FYI)"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "builderless"
+      mixins: "experimental"
+      mixins: "goma-ci"
+      mixins: "goma-ats"
+    }
+    builders {
+      name: "chromeos-amd64-generic-rel (Goma RBE FYI)"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "builderless"
+      mixins: "experimental"
+      mixins: "goma-ci"
+      mixins: "goma-ats"
+    }
+    builders {
+      name: "fuchsia-fyi-arm64-rel (Goma RBE FYI)"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "builderless"
+      mixins: "experimental"
+      mixins: "goma-ci"
+      mixins: "goma-ats"
+    }
+    builders {
+      name: "fuchsia-fyi-x64-rel (Goma RBE FYI)"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "builderless"
+      mixins: "experimental"
+      mixins: "goma-ci"
+      mixins: "goma-ats"
+    }
+    builders {
+      name: "Linux ASan LSan Builder (Goma RBE FYI)"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "builderless"
+      mixins: "experimental"
+      mixins: "goma-ci"
+      mixins: "goma-ats"
+    }
+    builders {
+      name: "Linux MSan Builder (Goma RBE FYI)"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "builderless"
       mixins: "experimental"
+      mixins: "goma-ci"
+      mixins: "goma-ats"
     }
+    # Goma Staging
     builders {
       name: "Chromium Mac Goma Staging"
       dimensions: "os:Mac-10.13"
       dimensions: "cores:4"
+      mixins: "experimental"
       mixins: "goma-ci"
       mixins: "goma-j80"
-      mixins: "experimental"
     }
     builders {
       name: "Chromium Linux Goma Staging"
       dimensions: "os:Ubuntu-14.04"
+      mixins: "experimental"
+      mixins: "goma-ci"
+    }
+    builders {
+      name: "CrWinGomaStaging"
+      dimensions: "os:Windows-10"
       mixins: "goma-ci"
       mixins: "experimental"
     }
@@ -2868,7 +3168,7 @@ buckets {
       mixins: "fyi-ci"
     }
     builders {
-      name: "ios-device-goma-canary-latest"
+      name: "ios-device-goma-latest-clobber"
       dimensions: "os:Mac-10.13"
       dimensions: "cores:4"
       mixins: "fyi-ci"
@@ -3029,7 +3329,7 @@ buckets {
       # Max. pending time for builds. CQ considers builds pending >2h as timed
       # out: http://shortn/_8PaHsdYmlq. Keep this in sync.
       expiration_secs: 7200 # 2h
-      execution_timeout_secs: 10800  # 3h
+      execution_timeout_secs: 14400  # 4h
       swarming_tags: "vpython:native-python-wrapper"
       build_numbers: YES
       # Adds dimension: "builder:<builder name>" to ensure builder affinity.
@@ -3142,56 +3442,60 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
     }
     builders {
-      mixins: "android-gpu-manual-try"
+      mixins: "android-optional-gpu-try"
       name: "gpu-manual-try-android-l-nexus-5-32"
     }
     builders {
-      mixins: "android-gpu-manual-try"
+      mixins: "android-optional-gpu-try"
       name: "gpu-manual-try-android-l-nexus-6-32"
     }
     builders {
-      mixins: "android-gpu-manual-try"
+      mixins: "android-optional-gpu-try"
       name: "gpu-manual-try-android-m-nexus-6p-64"
     }
     builders {
-      mixins: "android-gpu-manual-try"
+      mixins: "android-optional-gpu-try"
       name: "gpu-manual-try-android-m-nexus-9-64"
     }
     builders {
-      mixins: "android-gpu-manual-try"
+      mixins: "android-optional-gpu-try"
       name: "gpu-manual-try-android-n-nvidia-shield-tv-64"
     }
     builders {
-      mixins: "android-gpu-manual-try"
+      mixins: "android-optional-gpu-try"
       name: "gpu-manual-try-android-p-pixel-2-32"
     }
     builders {
-      mixins: "android-gpu-manual-try"
-      name: "gpu-manual-try-android-p-pixel-2-32-deqp"
+      mixins: "android-optional-gpu-try"
+      name: "gpu-manual-try-android-p-pixel-2-32-vk"
+    }
+    builders {
+      mixins: "android-optional-gpu-try"
+      name: "gpu-manual-try-android-p-pixel-2-32-deqp-vk"
     }
     builders {
-      mixins: "android-gpu-manual-try"
-      name: "gpu-manual-try-android-p-pixel-2-64"
+      mixins: "android-optional-gpu-try"
+      name: "gpu-manual-try-android-p-pixel-2-64-vk"
     }
     builders {
-      mixins: "android-gpu-manual-try"
-      name: "gpu-manual-try-android-p-pixel-2-64-deqp"
+      mixins: "android-optional-gpu-try"
+      name: "gpu-manual-try-android-p-pixel-2-64-deqp-vk"
     }
     builders {
-      mixins: "android-gpu-manual-try"
-      name: "gpu-manual-try-android-p-pixel-xl-32"
+      mixins: "android-optional-gpu-try"
+      name: "gpu-manual-try-android-p-pixel-xl-32-vk"
     }
     builders {
-      mixins: "android-gpu-manual-try"
-      name: "gpu-manual-try-android-p-pixel-xl-32-deqp"
+      mixins: "android-optional-gpu-try"
+      name: "gpu-manual-try-android-p-pixel-xl-32-deqp-vk"
     }
     builders {
-      mixins: "android-gpu-manual-try"
-      name: "gpu-manual-try-android-p-pixel-xl-64"
+      mixins: "android-optional-gpu-try"
+      name: "gpu-manual-try-android-p-pixel-xl-64-vk"
     }
     builders {
-      mixins: "android-gpu-manual-try"
-      name: "gpu-manual-try-android-p-pixel-xl-64-deqp"
+      mixins: "android-optional-gpu-try"
+      name: "gpu-manual-try-android-p-pixel-xl-64-deqp-vk"
     }
     builders {
       mixins: "android-try"
@@ -3223,12 +3527,6 @@ buckets {
       name: "linux-chromeos-rel"
     }
 
-    builders { mixins: "linux-angle-try" name: "linux_angle_compile_dbg_ng" }
-    builders { mixins: "linux-angle-try" name: "linux_angle_dbg_ng" }
-    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_ng" }
-
     builders { mixins: "linux-try" name: "cast_shell_audio_linux" }
     builders { mixins: "linux-try" name: "cast_shell_linux" }
     builders { mixins: "linux-try" name: "chromium_devtools" }
@@ -3248,6 +3546,9 @@ buckets {
         name: "closure_compilation"
       }
     }
+
+    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" }
@@ -3255,8 +3556,53 @@ buckets {
     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-optional-gpu-try"
+      name: "gpu-manual-try-linux-amd-rel"
+    }
+    builders {
+      mixins: "linux-optional-gpu-try"
+      name: "gpu-manual-try-linux-intel-dqp"
+    }
+    builders {
+      mixins: "linux-optional-gpu-try"
+      name: "gpu-manual-try-linux-intel-exp"
+    }
+    builders {
+      mixins: "linux-optional-gpu-try"
+      name: "gpu-manual-try-linux-intel-ozn"
+    }
+    builders {
+      mixins: "linux-optional-gpu-try"
+      name: "gpu-manual-try-linux-intel-rel"
+    }
+    builders {
+      mixins: "linux-optional-gpu-try"
+      name: "gpu-manual-try-linux-nvidia-dbg"
+    }
+    builders {
+      mixins: "linux-optional-gpu-try"
+      name: "gpu-manual-try-linux-nvidia-dqp"
+    }
+    builders {
+      mixins: "linux-optional-gpu-try"
+      name: "gpu-manual-try-linux-nvidia-exp"
+    }
+    builders {
+      mixins: "linux-optional-gpu-try"
+      name: "gpu-manual-try-linux-nvidia-rel"
+    }
+    builders {
+      mixins: "linux-optional-gpu-try"
+      name: "gpu-manual-try-linux-nvidia-tsn"
+    }
     builders { mixins: "linux-try" name: "leak_detection_linux" }
-    builders { mixins: "linux-try" name: "linux-blink-heap-incremental-marking" }
+    builders { mixins: "linux-angle-try" name: "linux-angle-rel" }
+    builders { mixins: "linux-angle-try" name: "linux_angle_compile_dbg_ng" }
+    builders { mixins: "linux-angle-try" name: "linux_angle_dbg_ng" }
+    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-try" 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 {
@@ -3370,9 +3716,10 @@ buckets {
     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-angle-try" name: "mac-angle-rel" }
     builders { mixins: "mac-angle-try" name: "mac_angle_compile_dbg_ng" }
     builders { mixins: "mac-angle-try" name: "mac_angle_dbg_ng" }
-    builders { mixins: "mac-angle-try" name: "mac_angle_rel_ng" }
     builders {
       mixins: "mac-try"
       name: "mac-jumbo-rel"
@@ -3394,10 +3741,10 @@ buckets {
       mixins: "mac-try"
       mixins: "goma-j150"
       name: "mac_chromium_compile_dbg_ng"
-      dimensions:"os:Mac-10.13.3"
+      dimensions:"os:Mac-10.13"
     }
     builders { mixins: "mac-try" name: "mac_chromium_compile_rel_ng" }
-    builders { mixins: "mac-try" name: "mac_chromium_dbg_ng" dimensions:"os:Mac-10.12"}
+    builders { mixins: "mac-try" name: "mac_chromium_dbg_ng" }
     builders {
       mixins: "mac-try"
       mixins: "goma-j150"
@@ -3412,10 +3759,60 @@ buckets {
     }
     builders { mixins: "mac-try" mixins: "upload_clang" name: "mac_upload_clang" }
 
+    builders { mixins: "win-dawn-try" name: "dawn-win10-x64-deps-rel" }
+    builders { mixins: "win-dawn-try" name: "dawn-win10-x86-deps-rel" }
+
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu_manual_try_win7_nvidia_rel"
-      execution_timeout_secs: 10800  # 3h
+      name: "gpu-manual-try-win7-amd-dbg"
+    }
+    builders {
+      mixins: "win-optional-gpu-try"
+      name: "gpu-manual-try-win7-amd-dqp"
+    }
+    builders {
+      mixins: "win-optional-gpu-try"
+      name: "gpu-manual-try-win7-amd-rel"
+    }
+    builders {
+      mixins: "win-optional-gpu-try"
+      name: "gpu-manual-try-win7-nvidia-dqp-64"
+    }
+    builders {
+      mixins: "win-optional-gpu-try"
+      name: "gpu-manual-try-win7-nvidia-rel"
+    }
+    builders {
+      mixins: "win-optional-gpu-try"
+      name: "gpu-manual-try-win7-nvidia-rel-64"
+    }
+    builders {
+      mixins: "win-optional-gpu-try"
+      name: "gpu-manual-try-win10-intel-dqp"
+    }
+    builders {
+      mixins: "win-optional-gpu-try"
+      name: "gpu-manual-try-win10-intel-exp"
+    }
+    builders {
+      mixins: "win-optional-gpu-try"
+      name: "gpu-manual-try-win10-intel-rel"
+    }
+    builders {
+      mixins: "win-optional-gpu-try"
+      name: "gpu-manual-try-win10-nvidia-dbg"
+    }
+    builders {
+      mixins: "win-optional-gpu-try"
+      name: "gpu-manual-try-win10-nvidia-dqp"
+    }
+    builders {
+      mixins: "win-optional-gpu-try"
+      name: "gpu-manual-try-win10-nvidia-exp"
+    }
+    builders {
+      mixins: "win-optional-gpu-try"
+      name: "gpu-manual-try-win10-nvidia-rel"
     }
     builders { mixins: "win-try" name: "win10_chromium_x64_dbg_ng" }
     builders {
@@ -3470,7 +3867,12 @@ buckets {
     builders { mixins: "win-dawn-try" name: "win-dawn-rel" }
     builders { mixins: "win-try" name: "win_mojo" }
     builders { mixins: "win-optional-gpu-try" name: "win_optional_gpu_tests_rel" }
-    builders { mixins: "win-try" mixins: "upload_clang" name: "win_upload_clang" }
+    builders {
+      mixins: "win-try"
+      mixins: "upload_clang"
+      name: "win_upload_clang"
+      dimensions: "cores:32"
+    }
     builders { mixins: "win-try" name: "win_x64_archive" }
 
     builders {
@@ -3609,7 +4011,6 @@ buckets {
     # Linux
 
     builders { mixins: "linux"  name: "WebRTC Chromium Linux Builder" }
-    builders { mixins: "linux"  name: "WebRTC Chromium Linux Builder (RBE)" }
     builders { mixins: "linux"  name: "WebRTC Chromium Linux Tester" }
 
     # Mac
@@ -3671,9 +4072,7 @@ buckets {
     # Linux
 
     builders { mixins: "linux"  name: "WebRTC Chromium FYI Linux Builder" }
-    builders { mixins: "linux"  name: "WebRTC Chromium FYI Linux Builder (RBE)" }
     builders { mixins: "linux"  name: "WebRTC Chromium FYI Linux Builder (dbg)" }
-    builders { mixins: "linux"  name: "WebRTC Chromium FYI Linux Builder (dbg) (RBE)" }
     builders { mixins: "linux"  name: "WebRTC Chromium FYI Linux Tester" }
 
     # Mac
diff --git a/chromium/infra/config/luci-milo.cfg b/chromium/infra/config/luci-milo.cfg
index ffdc316fbd9..f6c57fac5dd 100644
--- a/chromium/infra/config/luci-milo.cfg
+++ b/chromium/infra/config/luci-milo.cfg
@@ -1,3 +1,6 @@
+# See http://luci-config.appspot.com/schemas/projects:luci-milo.cfg for schema
+# of this file and documentation.
+
 logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/chromium.svg"
 
 headers {
@@ -132,6 +135,11 @@ headers {
       alt: "Chromium Chromedriver console"
     }
     links {
+      text: "dawn"
+      url: "/p/chromium/g/chromium.dawn"
+      alt: "Chromium Dawn console"
+    }
+    links {
       text: "fuzz"
       url: "/p/chromium/g/chromium.fuzz"
       alt: "Chromium Fuzz console"
@@ -148,7 +156,7 @@ headers {
     }
     links {
       text: "perf"
-      url: "/p/chromium/g/chromium.perf"
+      url: "/p/chrome/g/chrome.perf/console"
       alt: "Chromium Perf console"
     }
     links {
@@ -185,6 +193,11 @@ headers {
       alt: "Blink"
     }
     links {
+      text: "chrome"
+      url: "/p/chrome/g/tryserver.chromium.chrome/builders"
+      alt: "Chrome"
+    }
+    links {
       text: "chromiumos"
       url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
       alt: "ChromiumOS"
@@ -234,7 +247,7 @@ headers {
   }
   console_groups {
     console_ids: "chromium/chromium.android"
-    console_ids: "chromium/chromium.perf"
+    console_ids: "chrome/chrome.perf"
     console_ids: "chromium/chromium.gpu.fyi"
     console_ids: "chromium/chromium.fuzz"
   }
@@ -349,13 +362,13 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chromium.ci/win32-rel"
-    category: "chromium|win|32"
-    short_name: "rel"
+    category: "chromium|win-rel"
+    short_name: "32"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/win-rel"
-    category: "chromium|win|64"
-    short_name: "rel"
+    category: "chromium|win-rel"
+    short_name: "64"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Win Builder"
@@ -409,40 +422,45 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Windows deterministic"
-    category: "chromium.win"
+    category: "chromium.win|misc"
     short_name: "det"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/WebKit Win10"
-    category: "chromium.win"
+    category: "chromium.win|misc"
     short_name: "wbk"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac Builder"
-    category: "chromium.mac|release|builder"
+    category: "chromium.mac|release"
     short_name: "bld"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
-    category: "chromium.mac|release|tester"
+    category: "chromium.mac|release"
     short_name: "10"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
-    category: "chromium.mac|release|tester"
+    category: "chromium.mac|release"
     short_name: "11"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac10.12 Tests"
-    category: "chromium.mac|release|tester"
+    category: "chromium.mac|release"
     short_name: "12"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac10.13 Tests"
-    category: "chromium.mac|release|tester"
+    category: "chromium.mac|release"
     short_name: "13"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/WebKit Mac10.13 (retina)"
+    category: "chromium.mac|release"
+    short_name: "ret"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
     category: "chromium.mac|debug"
     short_name: "bld"
@@ -454,17 +472,17 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chromium.ci/ios-device"
-    category: "chromium.mac|ios"
+    category: "chromium.mac|ios|default"
     short_name: "dev"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/ios-simulator"
-    category: "chromium.mac|ios"
+    category: "chromium.mac|ios|default"
     short_name: "sim"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/ios-simulator-full-configs"
-    category: "chromium.mac|ios"
+    category: "chromium.mac|ios|default"
     short_name: "ful"
   }
   builders {
@@ -479,20 +497,15 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chromium.ci/ios-uirefresh-simulator"
-    category: "chromium.mac|ios"
+    category: "chromium.mac|ios|misc"
     short_name: "ui"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/ios-slimnav"
-    category: "chromium.mac|ios"
+    category: "chromium.mac|ios|misc"
     short_name: "slim"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/WebKit Mac10.13 (retina)"
-    category: "chromium.mac"
-    short_name: "wbk"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/Linux Builder"
     category: "chromium.linux|release"
     short_name: "bld"
@@ -518,6 +531,21 @@ consoles {
     short_name: "jmb"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux"
+    category: "chromium.linux|release"
+    short_name: "det"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Leak Detection Linux"
+    category: "chromium.linux|release"
+    short_name: "lk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-ozone-rel"
+    category: "chromium.linux|release"
+    short_name: "ozo"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)(32)"
     category: "chromium.linux|debug|builder"
     short_name: "32"
@@ -528,6 +556,11 @@ consoles {
     short_name: "64"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux (dbg)"
+    category: "chromium.linux|debug|builder"
+    short_name: "det"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)(32)"
     category: "chromium.linux|debug|tester"
     short_name: "32"
@@ -538,21 +571,6 @@ consoles {
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Deterministic Linux (dbg)"
-    category: "chromium.linux|debug"
-    short_name: "det"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Deterministic Linux"
-    category: "chromium.linux"
-    short_name: "det"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Leak Detection Linux"
-    category: "chromium.linux"
-    short_name: "lk"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/Cast Linux"
     category: "chromium.linux|cast"
     short_name: "vid"
@@ -574,20 +592,15 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Fuchsia ARM64"
-    category: "chromium.linux|fuchsia"
+    category: "chromium.linux|fuchsia|misc"
     short_name: "a64"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Fuchsia x64"
-    category: "chromium.linux|fuchsia"
+    category: "chromium.linux|fuchsia|misc"
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/linux-ozone-rel"
-    category: "chromium.linux|ozone"
-    short_name: "bld"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/Linux ChromiumOS Full"
     category: "chromium.chromiumos|default"
     short_name: "ful"
@@ -599,18 +612,23 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chromium.ci/linux-chromeos-dbg"
-    category: "chromium.chromiumos"
+    category: "chromium.chromiumos|default"
     short_name: "dbg"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-asan-rel"
+    category: "chromium.chromiumos|simple|release|x64"
+    short_name: "asn"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-cfi-thin-lto-rel"
-    category: "chromium.chromiumos|simple|release"
-    short_name: "x64"
+    category: "chromium.chromiumos|simple|release|x64"
+    short_name: "cfi"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel"
-    category: "chromium.chromiumos|simple|release"
-    short_name: "x64"
+    category: "chromium.chromiumos|simple|release|x64"
+    short_name: "rel"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/chromeos-daisy-rel"
@@ -623,24 +641,24 @@ consoles {
     short_name: "kvn"
   }
   builders {
-    name: "buildbucket/luci.chrome.ci/Google Chrome Win"
+    name: "buildbucket/luci.chrome.ci/linux-chromeos-google-rel"
     category: "chromium.chrome"
-    short_name: "win"
+    short_name: "cro"
   }
   builders {
-    name: "buildbucket/luci.chrome.ci/Google Chrome Linux x64"
+    name: "buildbucket/luci.chrome.ci/linux-google-rel"
     category: "chromium.chrome"
     short_name: "lnx"
   }
   builders {
-    name: "buildbucket/luci.chrome.ci/Google Chrome Mac"
+    name: "buildbucket/luci.chrome.ci/mac-google-rel"
     category: "chromium.chrome"
     short_name: "mac"
   }
   builders {
-    name: "buildbucket/luci.chrome.ci/Google Chrome ChromeOS"
+    name: "buildbucket/luci.chrome.ci/win-google-rel"
     category: "chromium.chrome"
-    short_name: "cro"
+    short_name: "win"
   }
   builders {
     name: "buildbot/chromium.memory/win-asan"
@@ -698,12 +716,6 @@ consoles {
     short_name: "tst"
   }
   builders {
-    name: "buildbot/chromium.memory/Linux CFI"
-    name: "buildbucket/luci.chromium.ci/Linux CFI"
-    category: "chromium.memory|linux"
-    short_name: "cfi"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/WebKit Linux Trusty ASAN"
     category: "chromium.memory|linux|webkit"
     short_name: "asn"
@@ -745,8 +757,14 @@ consoles {
   builders {
     name: "buildbot/chromium.memory/Android CFI"
     name: "buildbucket/luci.chromium.ci/Android CFI"
-    category: "chromium.memory|android"
-    short_name: "cfi"
+    category: "chromium.memory|cfi"
+    short_name: "and"
+  }
+  builders {
+    name: "buildbot/chromium.memory/Linux CFI"
+    name: "buildbucket/luci.chromium.ci/Linux CFI"
+    category: "chromium.memory|cfi"
+    short_name: "lnx"
   }
 }
 
@@ -809,10 +827,12 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Windows deterministic"
+    category: "misc"
     short_name: "det"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/WebKit Win10"
+    category: "misc"
     short_name: "wbk"
   }
 }
@@ -826,30 +846,35 @@ consoles {
   manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.chromium.ci/Mac Builder"
-    category: "release|builder"
+    category: "release"
     short_name: "bld"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
-    category: "release|tester"
+    category: "release"
     short_name: "10"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
-    category: "release|tester"
+    category: "release"
     short_name: "11"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac10.12 Tests"
-    category: "release|tester"
+    category: "release"
     short_name: "12"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac10.13 Tests"
-    category: "release|tester"
+    category: "release"
     short_name: "13"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/WebKit Mac10.13 (retina)"
+    category: "release"
+    short_name: "ret"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
     category: "debug"
     short_name: "bld"
@@ -861,17 +886,17 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chromium.ci/ios-device"
-    category: "ios"
+    category: "ios|default"
     short_name: "dev"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/ios-simulator"
-    category: "ios"
+    category: "ios|default"
     short_name: "sim"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/ios-simulator-full-configs"
-    category: "ios"
+    category: "ios|default"
     short_name: "ful"
   }
   builders {
@@ -886,18 +911,14 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chromium.ci/ios-uirefresh-simulator"
-    category: "ios"
+    category: "ios|misc"
     short_name: "ui"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/ios-slimnav"
-    category: "ios"
+    category: "ios|misc"
     short_name: "slim"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/WebKit Mac10.13 (retina)"
-    short_name: "wbk"
-  }
 }
 
 consoles {
@@ -933,6 +954,21 @@ consoles {
     short_name: "jmb"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux"
+    category: "release"
+    short_name: "det"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Leak Detection Linux"
+    category: "release"
+    short_name: "lk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-ozone-rel"
+    category: "release"
+    short_name: "ozo"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)(32)"
     category: "debug|builder"
     short_name: "32"
@@ -943,6 +979,11 @@ consoles {
     short_name: "64"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux (dbg)"
+    category: "debug|builder"
+    short_name: "det"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)(32)"
     category: "debug|tester"
     short_name: "32"
@@ -953,19 +994,6 @@ consoles {
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Deterministic Linux (dbg)"
-    category: "debug"
-    short_name: "det"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Deterministic Linux"
-    short_name: "det"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Leak Detection Linux"
-    short_name: "lk"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/Cast Linux"
     category: "cast"
     short_name: "vid"
@@ -987,19 +1015,14 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Fuchsia ARM64"
-    category: "fuchsia"
+    category: "fuchsia|misc"
     short_name: "a64"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Fuchsia x64"
-    category: "fuchsia"
+    category: "fuchsia|misc"
     short_name: "x64"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/linux-ozone-rel"
-    category: "ozone"
-    short_name: "bld"
-  }
 }
 
 consoles {
@@ -1021,17 +1044,23 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chromium.ci/linux-chromeos-dbg"
+    category: "default"
     short_name: "dbg"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-asan-rel"
+    category: "simple|release|x64"
+    short_name: "asn"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-cfi-thin-lto-rel"
-    category: "simple|release"
-    short_name: "x64"
+    category: "simple|release|x64"
+    short_name: "cfi"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel"
-    category: "simple|release"
-    short_name: "x64"
+    category: "simple|release|x64"
+    short_name: "rel"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/chromeos-daisy-rel"
@@ -1108,12 +1137,6 @@ consoles {
     short_name: "tst"
   }
   builders {
-    name: "buildbot/chromium.memory/Linux CFI"
-    name: "buildbucket/luci.chromium.ci/Linux CFI"
-    category: "linux"
-    short_name: "cfi"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/WebKit Linux Trusty ASAN"
     category: "linux|webkit"
     short_name: "asn"
@@ -1155,123 +1178,13 @@ consoles {
   builders {
     name: "buildbot/chromium.memory/Android CFI"
     name: "buildbucket/luci.chromium.ci/Android CFI"
-    category: "android"
-    short_name: "cfi"
-  }
-}
-
-consoles {
-  header_id: "chromium"
-  id: "chromium.perf"
-  name: "chromium.perf"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbot/chromium.perf/Android Builder Perf"
-    name: "buildbucket/luci.chrome.ci/Android Builder Perf"
-    category: "builder|android"
-    short_name: "arm"
-  }
-  builders {
-    name: "buildbot/chromium.perf/Android arm64 Builder Perf"
-    name: "buildbucket/luci.chrome.ci/Android arm64 Builder Perf"
-    category: "builder|android"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.chrome.ci/android-builder-perf"
-    category: "builder|android|compile"
-    short_name: "arm"
-  }
-  builders {
-    name: "buildbucket/luci.chrome.ci/android_arm64-builder-perf"
-    category: "builder|android|compile"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.chrome.ci/win32-builder-perf"
-    category: "builder|win"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chrome.ci/win64-builder-perf"
-    category: "builder|win"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chrome.ci/mac-builder-perf"
-    category: "builder"
-    short_name: "mac"
-  }
-  builders {
-    name: "buildbucket/luci.chrome.ci/linux-builder-perf"
-    category: "builder"
-    short_name: "lnx"
-  }
-  builders {
-    name: "buildbot/chromium.perf/Android Nexus5 Perf"
-    name: "buildbucket/luci.chrome.ci/Android Nexus5 Perf"
-    category: "perf|android"
-    short_name: "N5"
-  }
-  builders {
-    name: "buildbot/chromium.perf/android-nexus5x-perf"
-    name: "buildbucket/luci.chrome.ci/android-nexus5x-perf"
-    category: "perf|android"
-    short_name: "N5X"
-  }
-  builders {
-    name: "buildbucket/luci.chrome.ci/android-go-perf"
-    category: "perf|android"
-    short_name: "go"
-  }
-  builders {
-    name: "buildbot/chromium.perf/Android Nexus5X WebView Perf"
-    name: "buildbucket/luci.chrome.ci/Android Nexus5X WebView Perf"
-    category: "perf|android|webview"
-    short_name: "N5X"
-  }
-  builders {
-    name: "buildbot/chromium.perf/Android Nexus6 WebView Perf"
-    name: "buildbucket/luci.chrome.ci/Android Nexus6 WebView Perf"
-    category: "perf|android|webview"
-    short_name: "N6"
-  }
-  builders {
-    name: "buildbot/chromium.perf/win-10-perf"
-    name: "buildbucket/luci.chrome.ci/win-10-perf"
-    category: "perf|win|10"
-    short_name: "w10"
-  }
-  builders {
-    name: "buildbot/chromium.perf/Win 7 Perf"
-    name: "buildbucket/luci.chrome.ci/Win 7 Perf"
-    category: "perf|win|7"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbot/chromium.perf/Win 7 Nvidia GPU Perf"
-    name: "buildbucket/luci.chrome.ci/Win 7 Nvidia GPU Perf"
-    category: "perf|win|7"
-    short_name: "nvi"
-  }
-  builders {
-    name: "buildbot/chromium.perf/mac-10_12_laptop_low_end-perf"
-    name: "buildbucket/luci.chrome.ci/mac-10_12_laptop_low_end-perf"
-    category: "perf|mac"
-    short_name: "low"
-  }
-  builders {
-    name: "buildbot/chromium.perf/mac-10_13_laptop_high_end-perf"
-    name: "buildbucket/luci.chrome.ci/mac-10_13_laptop_high_end-perf"
-    category: "perf|mac"
-    short_name: "high"
+    category: "cfi"
+    short_name: "and"
   }
   builders {
-    name: "buildbot/chromium.perf/linux-perf"
-    name: "buildbucket/luci.chrome.ci/linux-perf"
-    category: "perf"
+    name: "buildbot/chromium.memory/Linux CFI"
+    name: "buildbucket/luci.chromium.ci/Linux CFI"
+    category: "cfi"
     short_name: "lnx"
   }
 }
@@ -1299,11 +1212,6 @@ consoles {
     short_name: "med"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Mac ASAN Debug"
-    category: "mac asan"
-    short_name: "dbg"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/Mac ASAN Release"
     category: "mac asan"
     short_name: "rel"
@@ -1504,13 +1412,13 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chromium.ci/win32-rel"
-    category: "win|32"
-    short_name: "rel"
+    category: "win-rel"
+    short_name: "32"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/win-rel"
-    category: "win|64"
-    short_name: "rel"
+    category: "win-rel"
+    short_name: "64"
   }
 }
 
@@ -1925,6 +1833,11 @@ consoles {
     short_name: "rel"
   }
   builders {
+    name: "buildbucket/luci.chrome.ci/ToTMacOfficial"
+    category: "ToT Mac"
+    short_name: "ofi"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/ToTMac (dbg)"
     category: "ToT Mac"
     short_name: "dbg"
@@ -1980,7 +1893,6 @@ consoles {
     short_name: "asn"
   }
   builders {
-    name: "buildbot/chromium.clang/CrWinAsan(dll)"
     name: "buildbucket/luci.chromium.ci/CrWinAsan(dll)"
     category: "ToT Windows|Asan"
     short_name: "dll"
@@ -1991,7 +1903,6 @@ consoles {
     short_name: "fuz"
   }
   builders {
-    name: "buildbot/chromium.clang/linux-win_cross-rel"
     name: "buildbucket/luci.chromium.ci/linux-win_cross-rel"
     category: "ToT Windows"
     short_name: "lxw"
@@ -2137,6 +2048,11 @@ consoles {
     short_name: "rel"
   }
   builders {
+    name: "buildbucket/luci.chrome.ci/ToTMacOfficial"
+    category: "ToT Mac"
+    short_name: "ofi"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/ToTMac (dbg)"
     category: "ToT Mac"
     short_name: "dbg"
@@ -2152,6 +2068,11 @@ consoles {
     short_name: "rel"
   }
   builders {
+    name: "buildbucket/luci.chrome.ci/ToTWinOfficial"
+    category: "ToT Windows"
+    short_name: "ofi"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/ToTWin(dbg)"
     category: "ToT Windows"
     short_name: "dbg"
@@ -2403,7 +2324,7 @@ consoles {
     short_name: "loc"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel-goma-latest-client"
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel-goma-latest"
     category: "cros|rel"
   }
   builders {
@@ -2425,7 +2346,7 @@ consoles {
     category: "android|dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/ios-device-goma-latest-client-clobber"
+    name: "buildbucket/luci.chromium.ci/ios-device-goma-latest-clobber"
     category: "ios"
     short_name: "clb"
   }
@@ -2439,26 +2360,6 @@ consoles {
   refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium.ci/Android Builder (dbg)"
-    category: "android_builder"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Android Remoting Tests"
-    category: "android_tests"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Android Find Annotated Test"
-    category: "android_tests"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Android VR Tests"
-    category: "android_tests"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Linux Clang Analyzer"
-    category: "clang tot"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/Closure Compilation Linux"
     category: "closure_compilation"
   }
@@ -2473,11 +2374,21 @@ consoles {
     short_name: "vm"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/linux-chromeos-code-coverage"
+    category: "code_coverage"
+    short_name: "lcr"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/mac-code-coverage-generation"
     category: "code_coverage"
     short_name: "mac"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-code-coverage"
+    category: "code_coverage"
+    short_name: "ios"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/ios-simulator-cronet"
     category: "cronet"
   }
@@ -2506,10 +2417,6 @@ consoles {
     category: "default"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Chromium Windows Analyze"
-    category: "default"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/Mac deterministic"
     category: "deterministic"
   }
@@ -2656,9 +2563,9 @@ consoles {
     short_name: "TD"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/linux-blink-heap-incremental-marking"
+    name: "buildbucket/luci.chromium.ci/linux-blink-heap-concurrent-marking-tsan-rel"
     category: "linux|blink"
-    short_name: "IM"
+    short_name: "CM"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/linux-blink-heap-unified-gc"
@@ -2862,42 +2769,6 @@ consoles {
     name: "buildbucket/luci.chromium.ci/Chromium Android ARM 32-bit Goma RBE Staging"
     category: "rbe|staging|android arm|rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE Prod"
-    category: "rbe|prod|linux|rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE Prod (clobber)"
-    category: "rbe|prod|linux|rel"
-    short_name: "clb"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE Prod (dbg)"
-    category: "rbe|prod|linux|dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE Prod (dbg) (clobber)"
-    category: "rbe|prod|linux|dbg"
-    short_name: "clb"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Chromium Android ARM 32-bit Goma RBE Prod"
-    category: "rbe|prod|android arm|rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Chromium Android ARM 32-bit Goma RBE Prod (clobber)"
-    category: "rbe|prod|android arm|rel"
-    short_name: "clb"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Chromium Android ARM 32-bit Goma RBE Prod (dbg)"
-    category: "rbe|prod|android arm|dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)"
-    category: "rbe|prod|android arm|dbg"
-    short_name: "clb"
-  }
 }
 
 consoles {
@@ -2945,6 +2816,146 @@ consoles {
 
 consoles {
   header_id: "chromium"
+  id: "chromium.goma.loadtest"
+  name: "chromium.goma.loadtest"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "refs/heads/master"
+  manifest_name: "REVISION"
+  include_experimental_builds: true
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE LoadTest"
+    category: "linux|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE LoadTest (clobber)"
+    category: "linux|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE LoadTest (ATS)"
+    category: "linux|rel|ats"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE LoadTest (ATS) (clobber)"
+    category: "linux|rel|ats"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE LoadTest (debug)"
+    category: "linux|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE LoadTest (clobber) (debug)"
+    category: "linux|dbg"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE LoadTest (ATS) (debug)"
+    category: "linux|dbg|ats"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE LoadTest (ATS) (clobber) (debug)"
+    category: "linux|dbg|ats"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Android ARM 32-bit Goma RBE LoadTest"
+    category: "android arm|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Android ARM 32-bit Goma RBE LoadTest (clobber)"
+    category: "android arm|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Android ARM 32-bit Goma RBE LoadTest (debug)"
+    category: "android arm|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Android ARM 32-bit Goma RBE LoadTest (clobber) (debug)"
+    category: "android arm|dbg"
+    short_name: "clb"
+  }
+}
+
+consoles {
+  header_id: "chromium"
+  id: "chromium.goma.fyi"
+  name: "chromium.goma.fyi"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "refs/heads/master"
+  manifest_name: "REVISION"
+  include_experimental_builds: true
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE Prod"
+    category: "prod|linux|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE Prod (clobber)"
+    category: "prod|linux|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE Prod (dbg)"
+    category: "prod|linux|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE Prod (dbg) (clobber)"
+    category: "prod|linux|dbg"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Android ARM 32-bit Goma RBE Prod"
+    category: "prod|android arm|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Android ARM 32-bit Goma RBE Prod (clobber)"
+    category: "prod|android arm|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Android ARM 32-bit Goma RBE Prod (dbg)"
+    category: "prod|android arm|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)"
+    category: "prod|android arm|dbg"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Cast Linux (Goma RBE FYI)"
+    category: "tot|chromium.linux|cast"
+    short_name: "vid"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-fyi-arm64-rel (Goma RBE FYI)"
+    category: "tot|chromium.linux|fuchsia|misc"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-fyi-x64-rel (Goma RBE FYI)"
+    category: "tot|chromium.linux|fuchsia|misc"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel (Goma RBE FYI)"
+    category: "tot|chromium.chromiumos|simple|release|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Builder (Goma RBE FYI)"
+    category: "tot|chromium.memory|linux|asan lsan"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux MSan Builder (Goma RBE FYI)"
+    category: "tot|chromium.memory|linux|msan"
+    short_name: "bld"
+  }
+}
+
+consoles {
+  header_id: "chromium"
   id: "chromium.gpu"
   name: "chromium.gpu"
   repo_url: "https://chromium.googlesource.com/chromium/src"
@@ -3076,6 +3087,11 @@ consoles {
     short_name: "rel"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI Release (AMD RX 550)"
+    category: "Windows|10|AMD"
+    short_name: "rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Win7 FYI Debug (AMD)"
     category: "Windows|7|AMD"
     short_name: "dbg"
@@ -3091,6 +3107,11 @@ 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"
@@ -3276,6 +3297,11 @@ consoles {
     short_name: "dqp"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI SkiaRenderer Vulkan (NVIDIA)"
+    category: "Linux|Nvidia"
+    short_name: "skv"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux FYI GPU TSAN Release"
     category: "Linux"
     short_name: "tsn"
@@ -3311,14 +3337,9 @@ consoles {
     short_name: "STV"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Android FYI 32 Vk Release (Nexus 5X)"
-    category: "Android|vk|O32"
-    short_name: "N5X"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Android FYI 64 Vk Release (Nexus 5X)"
-    category: "Android|vk|O64"
-    short_name: "N5X"
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Pixel 2)"
+    category: "Android|P32|QCOM"
+    short_name: "P2"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Android FYI 32 Vk Release (Pixel XL)"
@@ -3346,16 +3367,6 @@ consoles {
     short_name: "N5X"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Android FYI 32 dEQP Vk Release (Nexus 5X)"
-    category: "Android|dqp|vk|O32"
-    short_name: "N5X"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Android FYI 64 dEQP Vk Release (Nexus 5X)"
-    category: "Android|dqp|vk|O64"
-    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"
@@ -3379,6 +3390,135 @@ consoles {
 
 consoles {
   header_id: "chromium"
+  id: "chromium.dawn"
+  name: "chromium.dawn"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 Builder"
+    category: "ToT|Linux|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 Release (Intel HD 630)"
+    category: "ToT|Linux|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 Release (NVIDIA)"
+    category: "ToT|Linux|Nvidia"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 Builder"
+    category: "ToT|Mac|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 Release (AMD)"
+    category: "ToT|Mac|AMD"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 Release (Intel)"
+    category: "ToT|Mac|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 Builder"
+    category: "ToT|Windows|Builder"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 Builder"
+    category: "ToT|Windows|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 Release (Intel HD 630)"
+    category: "ToT|Windows|Intel"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 Release (Intel HD 630)"
+    category: "ToT|Windows|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 Release (NVIDIA)"
+    category: "ToT|Windows|Nvidia"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 Release (NVIDIA)"
+    category: "ToT|Windows|Nvidia"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Builder"
+    category: "DEPS|Linux|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
+    category: "DEPS|Linux|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
+    category: "DEPS|Linux|Nvidia"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Builder"
+    category: "DEPS|Mac|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Release (AMD)"
+    category: "DEPS|Mac|AMD"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Release (Intel)"
+    category: "DEPS|Mac|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Builder"
+    category: "DEPS|Windows|Builder"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Builder"
+    category: "DEPS|Windows|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
+    category: "DEPS|Windows|Intel"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
+    category: "DEPS|Windows|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
+    category: "DEPS|Windows|Nvidia"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
+    category: "DEPS|Windows|Nvidia"
+    short_name: "x64"
+  }
+}
+
+consoles {
+  header_id: "chromium"
   id: "chromium.tools.build"
   name: "chromium.tools.build"
   repo_url: "https://chromium.googlesource.com/chromium/src"
@@ -3439,11 +3579,6 @@ consoles {
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Linux Builder (RBE)"
-    category: "linux"
-    short_name: "rbe"
-  }
-  builders {
     name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Linux Tester"
     category: "linux"
     short_name: "tst"
@@ -3518,21 +3653,11 @@ consoles {
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Linux Builder (dbg) (RBE)"
-    category: "linux|debug"
-    short_name: "rbe"
-  }
-  builders {
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Linux Builder"
     category: "linux|release"
     short_name: "bld"
   }
   builders {
-    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Linux Builder (RBE)"
-    category: "linux|release"
-    short_name: "rbe"
-  }
-  builders {
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Linux Tester"
     category: "linux|release"
     short_name: "tst"
@@ -3887,25 +4012,28 @@ consoles {
     name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-32-deqp"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-32-vk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-32-deqp-vk"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-64"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-64-vk"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-64-deqp"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-64-deqp-vk"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-32"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-32-vk"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-32-deqp"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-32-deqp-vk"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-64"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-64-vk"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-64-deqp"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-64-deqp-vk"
   }
   builders {
     name: "buildbucket/luci.chromium.try/android-deterministic-rel"
@@ -3991,6 +4119,36 @@ consoles {
     name: "buildbucket/luci.chromium.try/fuchsia-x64-cast"
   }
   builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-amd-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-intel-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-intel-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-intel-ozn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-intel-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-nvidia-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-nvidia-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-nvidia-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-nvidia-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-nvidia-tsn"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/layout_test_leak_detection"
   }
   builders {
@@ -4211,7 +4369,43 @@ consoles {
   refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium.try/gpu_manual_try_win7_nvidia_rel"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win7-amd-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win7-amd-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win7-amd-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win7-nvidia-dqp-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win7-nvidia-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win7-nvidia-rel-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win10-intel-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win10-intel-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win10-intel-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win10-nvidia-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win10-nvidia-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win10-nvidia-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win10-nvidia-rel"
   }
   builders {
     name: "buildbucket/luci.chromium.try/win-libfuzzer-asan-rel"
@@ -4254,7 +4448,7 @@ consoles {
     name: "buildbucket/luci.chromium.try/win_optional_gpu_tests_rel"
   }
   builders {
-    name: "buildbot/tryserver.chromium.win/win_upload_clang"
+    name: "buildbucket/luci.chromium.try/win_upload_clang"
   }
   builders {
     name: "buildbucket/luci.chromium.try/win_x64_archive"
@@ -4333,6 +4527,9 @@ consoles {
     name: "buildbucket/luci.chromium.try/android_angle_vk64_rel_ng"
   }
   builders {
+    name: "buildbucket/luci.chromium.try/linux-angle-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_angle_dbg_ng"
   }
   builders {
@@ -4342,15 +4539,12 @@ consoles {
     name: "buildbucket/luci.chromium.try/linux_angle_ozone_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/linux_angle_rel_ng"
+    name: "buildbucket/luci.chromium.try/mac-angle-rel"
   }
   builders {
     name: "buildbucket/luci.chromium.try/mac_angle_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/mac_angle_rel_ng"
-  }
-  builders {
     name: "buildbucket/luci.chromium.try/win-angle-rel"
   }
   builders {
@@ -4481,31 +4675,103 @@ consoles {
     name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-32-deqp"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-32-vk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-32-deqp-vk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-64-vk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-64-deqp-vk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-32-vk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-32-deqp-vk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-64-vk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-64-deqp-vk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-amd-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-intel-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-intel-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-intel-ozn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-intel-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-nvidia-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-nvidia-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-nvidia-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-nvidia-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-linux-nvidia-tsn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win7-amd-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-64"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win7-amd-dqp"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-2-64-deqp"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win7-amd-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-32"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win7-nvidia-dqp-64"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-32-deqp"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win7-nvidia-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-64"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win7-nvidia-rel-64"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-manual-try-android-p-pixel-xl-64-deqp"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win10-intel-dqp"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu_manual_try_win7_nvidia_rel"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win10-intel-exp"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/linux-blink-heap-incremental-marking"
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win10-intel-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win10-nvidia-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win10-nvidia-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win10-nvidia-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-manual-try-win10-nvidia-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-angle-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-blink-heap-concurrent-marking-tsan-rel"
   }
   builders {
     name: "buildbucket/luci.chromium.try/linux-blink-heap-verification-try"
@@ -4535,9 +4801,6 @@ consoles {
     name: "buildbucket/luci.chromium.try/linux_angle_ozone_rel_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/linux_angle_rel_ng"
-  }
-  builders {
     name: "buildbucket/luci.chromium.try/linux_arm"
   }
   builders {
@@ -4644,6 +4907,9 @@ consoles {
     name: "buildbucket/luci.chromium.try/ios12-sdk-simulator"
   }
   builders {
+    name: "buildbucket/luci.chromium.try/mac-angle-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/mac-jumbo-rel"
   }
   builders {
@@ -4653,9 +4919,6 @@ consoles {
     name: "buildbucket/luci.chromium.try/mac_angle_dbg_ng"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/mac_angle_rel_ng"
-  }
-  builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_10.10_macviews"
   }
   builders {
diff --git a/chromium/infra/config/luci-notify.cfg b/chromium/infra/config/luci-notify.cfg
index ed9923b741c..5aea99fb370 100644
--- a/chromium/infra/config/luci-notify.cfg
+++ b/chromium/infra/config/luci-notify.cfg
@@ -110,10 +110,6 @@ notifiers {
     bucket: "ci"
   }
   builders {
-    name: "Mac ASAN Debug"
-    bucket: "ci"
-  }
-  builders {
     name: "Mac ASAN Release"
     bucket: "ci"
   }
diff --git a/chromium/infra/config/luci-scheduler.cfg b/chromium/infra/config/luci-scheduler.cfg
index d25de5799ef..e328adc252a 100644
--- a/chromium/infra/config/luci-scheduler.cfg
+++ b/chromium/infra/config/luci-scheduler.cfg
@@ -70,19 +70,14 @@ trigger {
   triggers: "Android ASAN (dbg)"
   triggers: "Android Builder (dbg) Goma Canary"
   triggers: "Android Builder (dbg) Goma Latest Client"
-  triggers: "Android Builder (dbg)"
   triggers: "Android CFI"
   triggers: "Android Cronet Builder"
-  triggers: "Android FYI 32 Vk Release (Nexus 5X)"
   triggers: "Android FYI 32 Vk Release (Pixel 2)"
   triggers: "Android FYI 32 Vk Release (Pixel XL)"
-  triggers: "Android FYI 32 dEQP Vk Release (Nexus 5X)"
   triggers: "Android FYI 32 dEQP Vk Release (Pixel 2)"
   triggers: "Android FYI 32 dEQP Vk Release (Pixel XL)"
-  triggers: "Android FYI 64 Vk Release (Nexus 5X)"
   triggers: "Android FYI 64 Vk Release (Pixel 2)"
   triggers: "Android FYI 64 Vk Release (Pixel XL)"
-  triggers: "Android FYI 64 dEQP Vk Release (Nexus 5X)"
   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)"
@@ -91,6 +86,7 @@ trigger {
   triggers: "Android FYI Release (Nexus 6)"
   triggers: "Android FYI Release (Nexus 6P)"
   triggers: "Android FYI Release (Nexus 9)"
+  triggers: "Android FYI Release (Pixel 2)"
   triggers: "Android FYI dEQP Release (Nexus 5X)"
   triggers: "Android Release (Nexus 5X)"
   triggers: "Android arm Builder (dbg)"
@@ -102,6 +98,11 @@ trigger {
   triggers: "Cast Android (dbg)"
   triggers: "Cast Audio Linux"
   triggers: "Cast Linux"
+  triggers: "Cast Linux (Goma RBE FYI)"
+  triggers: "Chromium Android ARM 32-bit Goma RBE LoadTest"
+  triggers: "Chromium Android ARM 32-bit Goma RBE LoadTest (clobber)"
+  triggers: "Chromium Android ARM 32-bit Goma RBE LoadTest (clobber) (debug)"
+  triggers: "Chromium Android ARM 32-bit Goma RBE LoadTest (debug)"
   triggers: "Chromium Android ARM 32-bit Goma RBE Prod"
   triggers: "Chromium Android ARM 32-bit Goma RBE Prod (clobber)"
   triggers: "Chromium Android ARM 32-bit Goma RBE Prod (dbg)"
@@ -109,6 +110,14 @@ trigger {
   triggers: "Chromium Android ARM 32-bit Goma RBE Staging"
   triggers: "Chromium Android ARM 32-bit Goma RBE ToT"
   triggers: "Chromium Android ARM 32-bit Goma RBE ToT (ATS)"
+  triggers: "Chromium Linux Goma RBE LoadTest"
+  triggers: "Chromium Linux Goma RBE LoadTest (ATS)"
+  triggers: "Chromium Linux Goma RBE LoadTest (ATS) (clobber)"
+  triggers: "Chromium Linux Goma RBE LoadTest (ATS) (clobber) (debug)"
+  triggers: "Chromium Linux Goma RBE LoadTest (ATS) (debug)"
+  triggers: "Chromium Linux Goma RBE LoadTest (clobber)"
+  triggers: "Chromium Linux Goma RBE LoadTest (clobber) (debug)"
+  triggers: "Chromium Linux Goma RBE LoadTest (debug)"
   triggers: "Chromium Linux Goma RBE Prod"
   triggers: "Chromium Linux Goma RBE Prod (clobber)"
   triggers: "Chromium Linux Goma RBE Prod (dbg)"
@@ -129,12 +138,19 @@ trigger {
   triggers: "Chromium Win Goma RBE ToT"
   triggers: "Chromium Win Goma RBE Staging"
   triggers: "Chromium Win Goma RBE Staging (clobber)"
-  triggers: "Chromium Windows Analyze"
   triggers: "ChromiumOS ASAN Release"
   triggers: "Closure Compilation Linux"
   triggers: "CrWinAsan"
   triggers: "CrWinAsan(dll)"
   triggers: "CrWinGomaStaging"
+  triggers: "Dawn Linux x64 Builder"
+  triggers: "Dawn Linux x64 DEPS Builder"
+  triggers: "Dawn Mac x64 Builder"
+  triggers: "Dawn Mac x64 DEPS Builder"
+  triggers: "Dawn Win10 x64 Builder"
+  triggers: "Dawn Win10 x64 DEPS Builder"
+  triggers: "Dawn Win10 x86 Builder"
+  triggers: "Dawn Win10 x86 DEPS Builder"
   triggers: "Deterministic Android (dbg)"
   triggers: "Deterministic Android"
   triggers: "Deterministic Linux (dbg)"
@@ -181,6 +197,7 @@ trigger {
   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)"
   triggers: "Linux Builder (dbg)(32)"
   triggers: "Linux Builder Goma Canary"
@@ -190,9 +207,9 @@ trigger {
   triggers: "Linux Chromium OS ASan LSan Builder"
   triggers: "Linux ChromiumOS Full"
   triggers: "Linux ChromiumOS MSan Builder"
-  triggers: "Linux Clang Analyzer"
   triggers: "Linux FYI GPU TSAN Release"
   triggers: "Linux MSan Builder"
+  triggers: "Linux MSan Builder (Goma RBE FYI)"
   triggers: "Linux TSan Builder"
   triggers: "Linux Viz"
   triggers: "Linux remote_run Builder"
@@ -202,7 +219,6 @@ trigger {
   triggers: "Linux x64 Goma Latest Client LocalOutputCache"
   triggers: "MSAN Release (chained origins)"
   triggers: "MSAN Release (no origins)"
-  triggers: "Mac ASAN Debug"
   triggers: "Mac ASAN Release Media"
   triggers: "Mac ASAN Release"
   triggers: "Mac ASan 64 Builder"
@@ -303,21 +319,26 @@ trigger {
   triggers: "android-marshmallow-arm64-rel"
   triggers: "android-mojo-webview-rel"
   triggers: "android-rel"
+  triggers: "chromeos-amd64-generic-asan-rel"
   triggers: "chromeos-amd64-generic-cfi-thin-lto-rel"
   triggers: "chromeos-amd64-generic-rel"
+  triggers: "chromeos-amd64-generic-rel (Goma RBE FYI)"
   triggers: "chromeos-amd64-generic-rel-goma-canary"
-  triggers: "chromeos-amd64-generic-rel-goma-latest-client"
+  triggers: "chromeos-amd64-generic-rel-goma-latest"
   triggers: "chromeos-amd64-generic-rel-vm-tests"
   triggers: "chromeos-daisy-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"
   triggers: "fuchsia-fyi-x64-rel"
+  triggers: "fuchsia-fyi-x64-rel (Goma RBE FYI)"
+  triggers: "ios-simulator-code-coverage"
   triggers: "ios-device"
   triggers: "ios-device-goma-canary-clobber"
-  triggers: "ios-device-goma-latest-client-clobber"
+  triggers: "ios-device-goma-latest-clobber"
   triggers: "ios-device-xcode-clang"
   triggers: "ios-simulator"
   triggers: "ios-simulator-cronet"
@@ -331,8 +352,9 @@ trigger {
   triggers: "ios12-sdk-simulator"
   triggers: "linux-annotator-rel"
   triggers: "linux-blink-animation-use-time-delta"
-  triggers: "linux-blink-heap-incremental-marking"
+  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-rel"
   triggers: "linux-chromium-tests-staging-builder"
@@ -353,7 +375,6 @@ trigger {
   triggers: "mac-rel"
   triggers: "WebRTC Chromium Android Builder"
   triggers: "WebRTC Chromium Linux Builder"
-  triggers: "WebRTC Chromium Linux Builder (RBE)"
   triggers: "WebRTC Chromium Mac Builder"
   triggers: "WebRTC Chromium Win Builder"
   triggers: "win-annotator-rel"
@@ -384,9 +405,7 @@ trigger {
   triggers: "WebRTC Chromium FYI ios-simulator"
 
   triggers: "WebRTC Chromium FYI Linux Builder"
-  triggers: "WebRTC Chromium FYI Linux Builder (RBE)"
   triggers: "WebRTC Chromium FYI Linux Builder (dbg)"
-  triggers: "WebRTC Chromium FYI Linux Builder (dbg) (RBE)"
 
   triggers: "WebRTC Chromium FYI Mac Builder"
   triggers: "WebRTC Chromium FYI Mac Builder (dbg)"
@@ -441,16 +460,6 @@ job {
 }
 
 job {
-  id: "Android FYI 32 dEQP Vk Release (Nexus 5X)"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android FYI 32 dEQP Vk Release (Nexus 5X)"
-  }
-}
-
-job {
   id: "Android FYI 32 dEQP Vk Release (Pixel 2)"
   acl_sets: "default"
   buildbucket: {
@@ -471,16 +480,6 @@ job {
 }
 
 job {
-  id: "Android FYI 32 Vk Release (Nexus 5X)"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android FYI 32 Vk Release (Nexus 5X)"
-  }
-}
-
-job {
   id: "Android FYI 32 Vk Release (Pixel 2)"
   acl_sets: "default"
   buildbucket: {
@@ -501,16 +500,6 @@ job {
 }
 
 job {
-  id: "Android FYI 64 dEQP Vk Release (Nexus 5X)"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android FYI 64 dEQP Vk Release (Nexus 5X)"
-  }
-}
-
-job {
   id: "Android FYI 64 dEQP Vk Release (Pixel 2)"
   acl_sets: "default"
   buildbucket: {
@@ -531,16 +520,6 @@ job {
 }
 
 job {
-  id: "Android FYI 64 Vk Release (Nexus 5X)"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android FYI 64 Vk Release (Nexus 5X)"
-  }
-}
-
-job {
   id: "Android FYI 64 Vk Release (Pixel 2)"
   acl_sets: "default"
   buildbucket: {
@@ -631,6 +610,16 @@ job {
 }
 
 job {
+  id: "Android FYI Release (Pixel 2)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Pixel 2)"
+  }
+}
+
+job {
   id: "Android Release (Nexus 5X)"
   acl_sets: "default"
   buildbucket: {
@@ -1034,19 +1023,6 @@ job {
 }
 
 job {
-  id: "Nougat Phone Tester"
-  # triggered by "Android arm64 Builder (dbg)"
-  acl_sets: "triggered-by-parent-builders"
-  # TODO(bpastene): s/noop/buildbucket.
-  noop: {}
-  # buildbucket: {
-  #   server: "cr-buildbucket.appspot.com"
-  #   bucket: "luci.chromium.ci"
-  #   builder: "Nougat Phone Tester"
-  # }
-}
-
-job {
   id: "Optional Android Release (Nexus 5X)"
   acl_sets: "default"
   # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
@@ -1091,6 +1067,16 @@ job {
 ################################################################################
 
 job {
+  id: "chromeos-amd64-generic-asan-rel"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "chromeos-amd64-generic-asan-rel"
+  }
+}
+
+job {
   id: "chromeos-amd64-generic-cfi-thin-lto-rel"
   acl_sets: "default"
   buildbucket: {
@@ -1161,6 +1147,16 @@ job {
 }
 
 job {
+  id: "linux-chromeos-code-coverage"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-chromeos-code-coverage"
+  }
+}
+
+job {
   id: "linux-chromeos-dbg"
   acl_sets: "default"
   buildbucket: {
@@ -1195,6 +1191,16 @@ job {
 ################################################################################
 
 job {
+  id: "ios-simulator-code-coverage"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-simulator-code-coverage"
+  }
+}
+
+job {
   id: "ios-device"
   acl_sets: "default"
   buildbucket: {
@@ -1310,6 +1316,22 @@ job {
 ################################################################################
 
 job {
+  id: "ANGLE GPU Linux Release (Intel HD 630)"
+  # Triggered by "GPU FYI Linux Builder".
+  acl_sets: "triggered-by-parent-builders"
+  # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
+  noop: {}
+}
+
+job {
+  id: "ANGLE GPU Linux Release (NVIDIA)"
+  # Triggered by "GPU FYI Linux Builder".
+  acl_sets: "triggered-by-parent-builders"
+  # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
+  noop: {}
+}
+
+job {
   id: "Cast Audio Linux"
   acl_sets: "default"
   buildbucket: {
@@ -1346,6 +1368,70 @@ job {
 }
 
 job {
+  id: "Dawn Linux x64 Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Linux x64 Builder"
+  }
+}
+
+job {
+  id: "Dawn Linux x64 Release (Intel HD 630)"
+  # Triggered by "Dawn Linux x64 Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Linux x64 Release (Intel HD 630)"
+  }
+}
+
+job {
+  id: "Dawn Linux x64 Release (NVIDIA)"
+  # Triggered by "Dawn Linux x64 Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Linux x64 Release (NVIDIA)"
+  }
+}
+
+job {
+  id: "Dawn Linux x64 DEPS Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Linux x64 DEPS Builder"
+  }
+}
+
+job {
+  id: "Dawn Linux x64 DEPS Release (Intel HD 630)"
+  # Triggered by "Dawn Linux x64 DEPS Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Linux x64 DEPS Release (Intel HD 630)"
+  }
+}
+
+job {
+  id: "Dawn Linux x64 DEPS Release (NVIDIA)"
+  # Triggered by "Dawn Linux x64 DEPS Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Linux x64 DEPS Release (NVIDIA)"
+  }
+}
+
+job {
   id: "Deterministic Linux"
   acl_sets: "default"
   buildbucket: {
@@ -1482,6 +1568,17 @@ job {
 }
 
 job {
+  id: "Linux FYI SkiaRenderer Vulkan (NVIDIA)"
+  # Triggered by "GPU FYI Linux Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI SkiaRenderer Vulkan (NVIDIA)"
+  }
+}
+
+job {
   id: "Optional Linux Release (Intel HD 630)"
   # Triggered by "GPU FYI Linux Builder".
   acl_sets: "triggered-by-parent-builders"
@@ -1623,12 +1720,12 @@ job {
 }
 
 job {
-  id: "linux-blink-heap-incremental-marking"
+  id: "linux-blink-heap-concurrent-marking-tsan-rel"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "linux-blink-heap-incremental-marking"
+    builder: "linux-blink-heap-concurrent-marking-tsan-rel"
   }
 }
 
@@ -1882,17 +1979,6 @@ job {
 }
 
 job {
-  id: "WebRTC Chromium Linux Builder (RBE)"
-  acl_sets: "default"
-  acl_sets: "webrtc"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.webrtc"
-    builder: "WebRTC Chromium Linux Builder (RBE)"
-  }
-}
-
-job {
   id: "WebRTC Chromium Linux Tester"
   acl_sets: "triggered-by-parent-builders"
   acl_sets: "webrtc"
@@ -1908,6 +1994,30 @@ job {
 ################################################################################
 
 job {
+  id: "ANGLE GPU Mac Release (Intel)"
+  # Triggered by "GPU FYI Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
+  noop: {}
+}
+
+job {
+  id: "ANGLE GPU Mac Retina Release (NVIDIA)"
+  # Triggered by "GPU FYI Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
+  noop: {}
+}
+
+job {
+  id: "ANGLE GPU Mac Retina Release (AMD)"
+  # Triggered by "GPU FYI Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
+  noop: {}
+}
+
+job {
   id: "Dawn GPU Mac Release (Intel)"
   # Triggered by "GPU FYI Mac Builder".
   acl_sets: "triggered-by-parent-builders"
@@ -1932,6 +2042,70 @@ job {
 }
 
 job {
+  id: "Dawn Mac x64 Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 Builder"
+  }
+}
+
+job {
+  id: "Dawn Mac x64 DEPS Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 DEPS Builder"
+  }
+}
+
+job {
+  id: "Dawn Mac x64 Release (AMD)"
+  # Triggered by "Dawn Mac x64 Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 Release (AMD)"
+  }
+}
+
+job {
+  id: "Dawn Mac x64 Release (Intel)"
+  # Triggered by "Dawn Mac x64 Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 Release (Intel)"
+  }
+}
+
+job {
+  id: "Dawn Mac x64 DEPS Release (AMD)"
+  # Triggered by "Dawn Mac x64 DEPS Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 DEPS Release (AMD)"
+  }
+}
+
+job {
+  id: "Dawn Mac x64 DEPS Release (Intel)"
+  # Triggered by "Dawn Mac x64 DEPS Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 DEPS Release (Intel)"
+  }
+}
+
+job {
   id: "GPU FYI Mac Builder"
   acl_sets: "default"
   buildbucket: {
@@ -2399,6 +2573,134 @@ job {
 }
 
 job {
+  id: "Dawn Win10 x64 Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 Builder"
+  }
+}
+
+job {
+  id: "Dawn Win10 x64 Release (Intel HD 630)"
+  # Triggered by "Dawn Win10 x64 Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 Release (Intel HD 630)"
+  }
+}
+
+job {
+  id: "Dawn Win10 x64 Release (NVIDIA)"
+  # Triggered by "Dawn Win10 x64 Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 Release (NVIDIA)"
+  }
+}
+
+job {
+  id: "Dawn Win10 x64 DEPS Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 DEPS Builder"
+  }
+}
+
+job {
+  id: "Dawn Win10 x64 DEPS Release (Intel HD 630)"
+  # Triggered by "Dawn Win10 x64 DEPS Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 DEPS Release (Intel HD 630)"
+  }
+}
+
+job {
+  id: "Dawn Win10 x64 DEPS Release (NVIDIA)"
+  # Triggered by "Dawn Win10 x64 DEPS Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 DEPS Release (NVIDIA)"
+  }
+}
+
+job {
+  id: "Dawn Win10 x86 Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x86 Builder"
+  }
+}
+
+job {
+  id: "Dawn Win10 x86 Release (Intel HD 630)"
+  # Triggered by "Dawn Win10 x86 Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x86 Release (Intel HD 630)"
+  }
+}
+
+job {
+  id: "Dawn Win10 x86 Release (NVIDIA)"
+  # Triggered by "Dawn Win10 x86 Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x86 Release (NVIDIA)"
+  }
+}
+
+job {
+  id: "Dawn Win10 x86 DEPS Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x86 DEPS Builder"
+  }
+}
+
+job {
+  id: "Dawn Win10 x86 DEPS Release (Intel HD 630)"
+  # Triggered by "Dawn Win10 x86 DEPS Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x86 DEPS Release (Intel HD 630)"
+  }
+}
+
+job {
+  id: "Dawn Win10 x86 DEPS Release (NVIDIA)"
+  # Triggered by "Dawn Win10 x86 DEPS Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x86 DEPS Release (NVIDIA)"
+  }
+}
+
+job {
   id: "GPU FYI Win Builder"
   acl_sets: "default"
   buildbucket: {
@@ -2425,6 +2727,17 @@ 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"
@@ -2447,6 +2760,17 @@ job {
 }
 
 job {
+  id: "Win10 FYI Release (AMD RX 550)"
+  # 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 Release (AMD RX 550)"
+  }
+}
+
+job {
   id: "Win10 FYI Release (Intel HD 630)"
   # Triggered by "GPU FYI Win Builder"
   acl_sets: "triggered-by-parent-builders"
@@ -2954,49 +3278,6 @@ job {
 }
 
 job {
-  id: "Android Builder (dbg)"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android Builder (dbg)"
-  }
-}
-
-job {
-  id: "Android Find Annotated Test"
-  # Triggered by "Android Builder (dbg)"
-  acl_sets: "triggered-by-parent-builders"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android Find Annotated Test"
-  }
-}
-
-job {
-  id: "Android Remoting Tests"
-  # Triggered by "Android Builder (dbg)"
-  acl_sets: "triggered-by-parent-builders"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android Remoting Tests"
-  }
-}
-
-job {
-  id: "Android VR Tests"
-  # Triggered by "Android Builder (dbg)"
-  acl_sets: "triggered-by-parent-builders"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android VR Tests"
-  }
-}
-
-job {
   id: "Android Builder (dbg) Goma Canary"
   acl_sets: "default"
   buildbucket: {
@@ -3137,16 +3418,6 @@ job {
 }
 
 job {
-  id: "Chromium Windows Analyze"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Chromium Windows Analyze"
-  }
-}
-
-job {
   id: "ChromiumOS ASAN Release"
   acl_sets: "default"
   buildbucket: {
@@ -3488,16 +3759,6 @@ job {
 }
 
 job {
-  id: "Linux Clang Analyzer"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Linux Clang Analyzer"
-  }
-}
-
-job {
   id: "Linux MSan Builder"
   acl_sets: "default"
   buildbucket: {
@@ -3646,19 +3907,6 @@ job {
 }
 
 job {
-  id: "Mac ASAN Debug"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Mac ASAN Debug"
-  }
-  triggering_policy: {
-    max_concurrent_invocations: 2
-  }
-}
-
-job {
   id: "Mac ASAN Release"
   acl_sets: "default"
   buildbucket: {
@@ -4289,22 +4537,22 @@ job {
 }
 
 job {
-  id: "chromeos-amd64-generic-rel-goma-latest-client"
+  id: "chromeos-amd64-generic-rel-goma-latest"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "chromeos-amd64-generic-rel-goma-latest-client"
+    builder: "chromeos-amd64-generic-rel-goma-latest"
   }
 }
 
 job {
-  id: "ios-device-goma-latest-client-clobber"
+  id: "ios-device-goma-latest-clobber"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "ios-device-goma-latest-client-clobber"
+    builder: "ios-device-goma-latest-clobber"
   }
 }
 
@@ -4429,6 +4677,126 @@ job {
 }
 
 job {
+  id: "Chromium Android ARM 32-bit Goma RBE LoadTest"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Chromium Android ARM 32-bit Goma RBE LoadTest"
+  }
+}
+
+job {
+  id: "Chromium Android ARM 32-bit Goma RBE LoadTest (debug)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Chromium Android ARM 32-bit Goma RBE LoadTest (debug)"
+  }
+}
+
+job {
+  id: "Chromium Android ARM 32-bit Goma RBE LoadTest (clobber)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Chromium Android ARM 32-bit Goma RBE LoadTest (clobber)"
+  }
+}
+
+job {
+  id: "Chromium Android ARM 32-bit Goma RBE LoadTest (clobber) (debug)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Chromium Android ARM 32-bit Goma RBE LoadTest (clobber) (debug)"
+  }
+}
+
+job {
+  id: "Chromium Linux Goma RBE LoadTest (ATS)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Chromium Linux Goma RBE LoadTest (ATS)"
+  }
+}
+
+job {
+  id: "Chromium Linux Goma RBE LoadTest (ATS) (debug)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Chromium Linux Goma RBE LoadTest (ATS) (debug)"
+  }
+}
+
+job {
+  id: "Chromium Linux Goma RBE LoadTest (ATS) (clobber)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Chromium Linux Goma RBE LoadTest (ATS) (clobber)"
+  }
+}
+
+job {
+  id: "Chromium Linux Goma RBE LoadTest (ATS) (clobber) (debug)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Chromium Linux Goma RBE LoadTest (ATS) (clobber) (debug)"
+  }
+}
+
+job {
+  id: "Chromium Linux Goma RBE LoadTest"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Chromium Linux Goma RBE LoadTest"
+  }
+}
+
+job {
+  id: "Chromium Linux Goma RBE LoadTest (debug)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Chromium Linux Goma RBE LoadTest (debug)"
+  }
+}
+
+job {
+  id: "Chromium Linux Goma RBE LoadTest (clobber)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Chromium Linux Goma RBE LoadTest (clobber)"
+  }
+}
+
+job {
+  id: "Chromium Linux Goma RBE LoadTest (clobber) (debug)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Chromium Linux Goma RBE LoadTest (clobber) (debug)"
+  }
+}
+
+job {
   id: "Chromium Linux Goma RBE ToT"
   acl_sets: "default"
   buildbucket: {
@@ -4609,6 +4977,66 @@ job {
 }
 
 job {
+  id: "Cast Linux (Goma RBE FYI)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Cast Linux (Goma RBE FYI)"
+  }
+}
+
+job {
+  id: "Linux ASan LSan Builder (Goma RBE FYI)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux ASan LSan Builder (Goma RBE FYI)"
+  }
+}
+
+job {
+  id: "Linux MSan Builder (Goma RBE FYI)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux MSan Builder (Goma RBE FYI)"
+  }
+}
+
+job {
+  id: "chromeos-amd64-generic-rel (Goma RBE FYI)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "chromeos-amd64-generic-rel (Goma RBE FYI)"
+  }
+}
+
+job {
+  id: "fuchsia-fyi-arm64-rel (Goma RBE FYI)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-fyi-arm64-rel (Goma RBE FYI)"
+  }
+}
+
+job {
+  id: "fuchsia-fyi-x64-rel (Goma RBE FYI)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-fyi-x64-rel (Goma RBE FYI)"
+  }
+}
+
+job {
   id: "Chromium Mac Goma Staging"
   acl_sets: "default"
   buildbucket: {
@@ -5109,17 +5537,6 @@ job {
 }
 
 job {
-  id: "WebRTC Chromium FYI Linux Builder (RBE)"
-  acl_sets: "default"
-  acl_sets: "webrtc"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.webrtc.fyi"
-    builder: "WebRTC Chromium FYI Linux Builder (RBE)"
-  }
-}
-
-job {
   id: "WebRTC Chromium FYI Linux Tester"
   acl_sets: "triggered-by-parent-builders"
   acl_sets: "webrtc"
@@ -5142,17 +5559,6 @@ job {
 }
 
 job {
-  id: "WebRTC Chromium FYI Linux Builder (dbg) (RBE)"
-  acl_sets: "default"
-  acl_sets: "webrtc"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.webrtc.fyi"
-    builder: "WebRTC Chromium FYI Linux Builder (dbg) (RBE)"
-  }
-}
-
-job {
   id: "WebRTC Chromium FYI Mac Builder"
   acl_sets: "default"
   acl_sets: "webrtc"
diff --git a/chromium/infra/config/tricium-prod.cfg b/chromium/infra/config/tricium-prod.cfg
index 6d633669e21..6a82b500faa 100644
--- a/chromium/infra/config/tricium-prod.cfg
+++ b/chromium/infra/config/tricium-prod.cfg
@@ -11,7 +11,7 @@ selections {
   platform: UBUNTU
   configs {
     name: "filter"
-    value: "-,+readability/todo,+readability/check,+readability/fn_size,+build/header_guard,+build/include_what_you_use,+build/include_order"
+    value: "-,+readability/todo,+readability/check,+readability/fn_size,+build/header_guard,+build/include_order"
   }
   configs {
     name: "verbose"
diff --git a/chromium/infra/scripts/legacy/scripts/slave/chromium/sizes.py b/chromium/infra/scripts/legacy/scripts/slave/chromium/sizes.py
index bdc24d052d4..d183db6f4f2 100755
--- a/chromium/infra/scripts/legacy/scripts/slave/chromium/sizes.py
+++ b/chromium/infra/scripts/legacy/scripts/slave/chromium/sizes.py
@@ -105,7 +105,7 @@ def main_mac(options, args, results_collector):
     app_bundle = base_name + '.app'
     framework_name = base_name + ' Framework'
     framework_bundle = framework_name + '.framework'
-    framework_dsym_bundle = framework_bundle + '.dSYM'
+    framework_dsym_bundle = framework_name + '.dSYM'
     framework_unstripped_name = framework_name + '.unstripped'
 
     chromium_app_dir = os.path.join(target_dir, app_bundle)
@@ -132,7 +132,9 @@ def main_mac(options, args, results_collector):
         'framework_name'   : re.sub(r'\s', '', framework_name),
         'framework_bundle' : re.sub(r'\s', '', framework_bundle),
         'app_size'         : get_size(chromium_executable),
-        'framework_size'   : get_size(chromium_framework_executable)
+        'framework_size'   : get_size(chromium_framework_executable),
+        'framework_dsym_name' : re.sub(r'\s', '', framework_name) + 'Dsym',
+        'framework_dsym_size' : get_size(chromium_framework_dsym),
       }
 
       # Collect the segment info out of the App
@@ -179,6 +181,9 @@ def main_mac(options, args, results_collector):
       results_collector.add_result(
           print_dict['app_bundle'], print_dict['app_bundle'],
           print_dict['app_bundle_size'], 'bytes')
+      results_collector.add_result(
+          print_dict['framework_dsym_name'], print_dict['framework_dsym_name'],
+          print_dict['framework_dsym_size'], 'bytes')
 
       # Found a match, don't check the other base_names.
       return result