BASELINE: Update Chromium to 85.0.4183.14085-based

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

13 files changed, 61539 insertions, 4227 deletions

diff --git a/chromium/infra/config/generated/commit-queue.cfg b/chromium/infra/config/generated/commit-queue.cfg
index 01ff6bcc2a7..895ebbed704 100644
--- a/chromium/infra/config/generated/commit-queue.cfg
+++ b/chromium/infra/config/generated/commit-queue.cfg
@@ -5,45 +5,208 @@
 #   https://luci-config.appspot.com/schemas/projects:commit-queue.cfg
 
 cq_status_host: "chromium-cq-status.appspot.com"
-submit_options: <
+submit_options {
   max_burst: 2
-  burst_delay: <
+  burst_delay {
     seconds: 60
-  >
->
-config_groups: <
+  }
+}
+config_groups {
   name: "cq"
-  gerrit: <
+  gerrit {
     url: "https://chromium-review.googlesource.com"
-    projects: <
+    projects {
       name: "chromium/src"
-      ref_regexp: "refs/branch-heads/4147"
-    >
-  >
-  verifiers: <
-    gerrit_cq_ability: <
+      ref_regexp: "refs/heads/.+"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
       committer_list: "project-chromium-committers"
       dry_run_access_list: "project-chromium-tryjob-access"
-    >
-    tryjob: <
-      builders: <
+    }
+    tree_status {
+      url: "https://chromium-status.appspot.com/"
+    }
+    tryjob {
+      builders {
+        name: "chrome/try/chromeos-betty-chrome"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/chromeos-betty-pi-arc-chrome"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/chromeos-eve-chrome"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/chromeos-eve-compile-chrome"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/chromeos-kevin-chrome"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/chromeos-kevin-compile-chrome"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/ipad-device"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/iphone-device"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/linux-chromeos-chrome"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/mac-chrome"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/mac-chrome-beta"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/mac-chrome-stable"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/win-chrome"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/win-chrome-beta"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/win-chrome-stable"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/win64-chrome"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/win64-chrome-beta"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/win64-chrome-stable"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chromium/try/android-10-arm64-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-asan"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-bfcache-rel"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/android-binary-size"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/android-cronet-arm-dbg"
         location_regexp: ".+/[+]/components/cronet/.+"
         location_regexp: ".+/[+]/components/grpc_support/.+"
         location_regexp: ".+/[+]/build/android/.+"
         location_regexp: ".+/[+]/build/config/android/.+"
         location_regexp_exclude: ".+/[+]/components/cronet/ios/.+"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/android-deterministic-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-deterministic-rel"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/android-lollipop-arm-rel"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/android-marshmallow-arm64-rel"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/android-marshmallow-x86-fyi-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-marshmallow-x86-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-nougat-arm64-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-official"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-opus-arm-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-oreo-arm64-cts-networkservice-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-oreo-arm64-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-pie-arm64-coverage-rel"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/android-pie-arm64-dbg"
         location_regexp: ".+/[+]/chrome/android/features/vr/.+"
         location_regexp: ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
@@ -53,14 +216,90 @@ config_groups: <
         location_regexp: ".+/[+]/third_party/gvr-android-sdk/.+"
         location_regexp: ".+/[+]/third_party/arcore-android-sdk/.+"
         location_regexp: ".+/[+]/third_party/arcore-android-sdk-client/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/android-pie-arm64-rel"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/android-pie-x86-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-weblayer-pie-arm64-fyi-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-weblayer-pie-x86-fyi-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-webview-marshmallow-arm64-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-webview-nougat-arm64-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-webview-oreo-arm64-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-webview-pie-arm64-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android-webview-pie-arm64-fyi-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android_angle_deqp_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android_angle_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android_angle_vk32_deqp_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android_angle_vk32_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android_angle_vk64_deqp_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android_angle_vk64_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android_archive_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android_arm64_dbg_recipe"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android_blink_rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android_cfi_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android_clang_dbg_recipe"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/android_compile_dbg"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/android_compile_x64_dbg"
         location_regexp: ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
@@ -70,8 +309,8 @@ config_groups: <
         location_regexp: ".+/[+]/sandbox/linux/system_headers/.+"
         location_regexp: ".+/[+]/sandbox/linux/tests/.+"
         location_regexp: ".+/[+]/third_party/gvr-android-sdk/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/android_compile_x86_dbg"
         location_regexp: ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
@@ -81,11 +320,19 @@ config_groups: <
         location_regexp: ".+/[+]/sandbox/linux/system_headers/.+"
         location_regexp: ".+/[+]/sandbox/linux/tests/.+"
         location_regexp: ".+/[+]/third_party/gvr-android-sdk/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/android_cronet"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/android_mojo"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/android_n5x_swarming_dbg"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/android_optional_gpu_tests_rel"
         location_regexp: ".+/[+]/cc/.+"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
@@ -102,42 +349,58 @@ config_groups: <
         location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
         location_regexp: ".+/[+]/tools/clang/scripts/update.py"
         location_regexp: ".+/[+]/ui/gl/.+"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/android_unswarmed_pixel_aosp"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/cast_shell_android"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/cast_shell_audio_linux"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/cast_shell_linux"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/chromeos-amd64-generic-cfi-thin-lto-rel"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/chromeos-amd64-generic-dbg"
         location_regexp: ".+/[+]/content/gpu/.+"
         location_regexp: ".+/[+]/media/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/chromeos-amd64-generic-rel"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/chromeos-arm-generic-dbg"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/chromeos-arm-generic-rel"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/chromeos-kevin-compile-rel"
         location_regexp: ".+/[+]/chromeos/CHROMEOS_LKGM"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/chromeos-kevin-rel"
         location_regexp: ".+/[+]/build/chromeos/.+"
         location_regexp: ".+/[+]/build/config/chromeos/.*"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/chromium_presubmit"
         disable_reuse: true
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/closure_compilation"
         location_regexp: ".+/[+]/third_party/closure_compiler/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/dawn-linux-x64-deps-rel"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
@@ -148,8 +411,8 @@ config_groups: <
         location_regexp: ".+/[+]/third_party/dawn/.+"
         location_regexp: ".+/[+]/tools/clang/scripts/update.py"
         location_regexp: ".+/[+]/ui/gl/features.gni"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/dawn-mac-x64-deps-rel"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
@@ -160,8 +423,16 @@ config_groups: <
         location_regexp: ".+/[+]/third_party/dawn/.+"
         location_regexp: ".+/[+]/tools/clang/scripts/update.py"
         location_regexp: ".+/[+]/ui/gl/features.gni"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/dawn-try-win10-x64-asan-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/dawn-try-win10-x86-rel"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/dawn-win10-x64-deps-rel"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
@@ -172,8 +443,8 @@ config_groups: <
         location_regexp: ".+/[+]/third_party/dawn/.+"
         location_regexp: ".+/[+]/tools/clang/scripts/update.py"
         location_regexp: ".+/[+]/ui/gl/features.gni"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/dawn-win10-x86-deps-rel"
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
@@ -184,78 +455,580 @@ config_groups: <
         location_regexp: ".+/[+]/third_party/dawn/.+"
         location_regexp: ".+/[+]/tools/clang/scripts/update.py"
         location_regexp: ".+/[+]/ui/gl/features.gni"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/fuchsia-angle-rel"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/fuchsia-arm64-cast"
         location_regexp: ".+/[+]/chromecast/.+"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/fuchsia-compile-x64-dbg"
+        experiment_percentage: 50
+      }
+      builders {
+        name: "chromium/try/fuchsia-fyi-arm64-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/fuchsia-fyi-x64-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/fuchsia-fyi-x64-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/fuchsia-official"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/fuchsia-x64-cast"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/fuchsia_arm64"
-      >
-      builders: <
+        experiment_percentage: 50
+      }
+      builders {
         name: "chromium/try/fuchsia_x64"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-android-l-nexus-5-32"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-android-l-nexus-6-32"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-android-m-nexus-5x-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-android-m-nexus-5x-deqp-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-android-m-nexus-5x-skgl-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-android-m-nexus-6p-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-android-m-nexus-9-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-android-n-nvidia-shield-tv-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-android-p-pixel-2-32"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-android-p-pixel-2-skv-32"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-android-q-pixel-2-deqp-vk-32"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-android-q-pixel-2-deqp-vk-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-android-q-pixel-2-vk-32"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-android-q-pixel-2-vk-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-chromeos-amd64-generic"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-chromeos-kevin"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-linux-intel-dqp"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-linux-intel-exp"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-linux-intel-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-linux-intel-sk-dawn-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-linux-intel-skv"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-linux-nvidia-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-linux-nvidia-dqp"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-linux-nvidia-exp"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-linux-nvidia-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-linux-nvidia-skv"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-linux-nvidia-tsn"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-mac-amd-dqp"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-mac-amd-pro-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-mac-amd-retina-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-mac-amd-retina-exp"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-mac-amd-retina-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-mac-asan"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-mac-intel-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-mac-intel-dqp"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-mac-intel-exp"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-mac-intel-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-mac-nvidia-retina-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-mac-nvidia-retina-exp"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-mac-nvidia-retina-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win10-intel-dqp-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win10-intel-exp-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win10-intel-rel-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win10-nvidia-dbg-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win10-nvidia-dqp-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win10-nvidia-dx12vk-dbg-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win10-nvidia-dx12vk-rel-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win10-nvidia-exp-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win10-nvidia-rel-32"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win10-nvidia-rel-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win10-nvidia-sk-dawn-rel-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win10-nvidia-skgl-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win7-amd-dbg-32"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win7-amd-dqp-32"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win7-amd-rel-32"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win7-nvidia-dqp-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win7-nvidia-rel-32"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-fyi-try-win7-nvidia-rel-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-try-android-m-nexus-5x-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-try-linux-nvidia-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-try-linux-nvidia-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-try-mac-amd-retina-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-try-mac-intel-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/gpu-try-win10-nvidia-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/ios-device"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/ios-simulator"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/ios-simulator-code-coverage"
+        experiment_percentage: 3
+      }
+      builders {
+        name: "chromium/try/ios-simulator-cr-recipe"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/ios-simulator-cronet"
         location_regexp: ".+/[+]/components/cronet/.+"
         location_regexp: ".+/[+]/components/grpc_support/.+"
         location_regexp: ".+/[+]/ios/.+"
         location_regexp_exclude: ".+/[+]/components/cronet/android/.+"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/ios-simulator-eg"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/ios-simulator-full-configs"
         location_regexp: ".+/[+]/ios/.+"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/ios-simulator-multi-window"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/ios-simulator-noncq"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/ios13-beta-simulator"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/ios13-sdk-simulator"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/ios14-beta-simulator"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/ios14-sdk-simulator"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/layout_test_leak_detection"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/leak_detection_linux"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-angle-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-annotator-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-autofill-assistant"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-bfcache-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-blink-heap-concurrent-marking-tsan-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-blink-heap-verification-try"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-blink-optional-highdpi-rel"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/linux-blink-rel"
         location_regexp: ".+/[+]/cc/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/paint/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/svg/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/linux-chromeos-compile-dbg"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/linux-chromeos-dbg"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/linux-chromeos-rel"
         cancel_stale: NO
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/linux-clang-tidy-dbg"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-clang-tidy-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-dawn-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-dcheck-off-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-gcc-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-layout-tests-edit-ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-layout-tests-fragment-item"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/linux-libfuzzer-asan-rel"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/linux-official"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/linux-ozone-rel"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/linux-perfetto-rel"
+        experiment_percentage: 100
+        location_regexp: ".+/[+]/base/trace_event/.+"
+        location_regexp: ".+/[+]/base/tracing/.+"
+        location_regexp: ".+/[+]/components/tracing/.+"
+        location_regexp: ".+/[+]/content/browser/tracing/.+"
+        location_regexp: ".+/[+]/services/tracing/.+"
+      }
+      builders {
         name: "chromium/try/linux-rel"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/linux-swangle-chromium-try-x64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-swangle-try-tot-angle-x64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-swangle-try-tot-angle-x86"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-swangle-try-tot-swiftshader-x64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-swangle-try-tot-swiftshader-x86"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-swangle-try-x64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-swangle-try-x86"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-trusty-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-viz-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-webkit-msan-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-wpt-fyi-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux_android_dbg_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux_angle_deqp_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux_angle_ozone_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux_chromium_analysis"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux_chromium_archive_rel_ng"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/linux_chromium_asan_rel_ng"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/linux_chromium_cfi_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux_chromium_chromeos_asan_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux_chromium_chromeos_msan_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux_chromium_clobber_deterministic"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux_chromium_clobber_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux_chromium_compile_dbg_32_ng"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/linux_chromium_compile_dbg_ng"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/linux_chromium_compile_rel_ng"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/linux_chromium_dbg_ng"
         location_regexp: ".+/[+]/build/.*check_gn_headers.*"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/linux_chromium_msan_rel_ng"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/linux_chromium_tsan_rel_ng"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/linux_chromium_ubsan_rel_ng"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/linux_layout_tests_composite_after_paint"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/paint/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/svg/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/.+"
         location_regexp: ".+/[+]/third_party/blink/web_tests/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "chromium/try/linux_layout_tests_layout_ng_disabled"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/editing/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/core/layout/.+"
@@ -265,8 +1038,16 @@ config_groups: <
         location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/.+"
         location_regexp: ".+/[+]/third_party/blink/web_tests/FlagExpectations/disable-layout-ng"
         location_regexp: ".+/[+]/third_party/blink/web_tests/flag-specific/disable-layout-ng/.+"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/linux_mojo"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux_mojo_chromeos"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/linux_optional_gpu_tests_rel"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
@@ -281,19 +1062,107 @@ config_groups: <
         location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
         location_regexp: ".+/[+]/tools/clang/scripts/update.py"
         location_regexp: ".+/[+]/ui/gl/.+"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/linux_upload_clang"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/linux_vr"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/mac-angle-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac-coverage-rel"
+        experiment_percentage: 3
+      }
+      builders {
+        name: "chromium/try/mac-dawn-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac-osxbeta-rel"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/mac-rel"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/mac-swangle-chromium-try-x64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac10.10-blink-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac10.11-blink-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac10.12-blink-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac10.13-blink-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac10.13_retina-blink-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac10.14-blink-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac10.15-blink-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac_chromium_10.10"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac_chromium_10.12_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac_chromium_10.13_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac_chromium_10.14_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac_chromium_10.15_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac_chromium_archive_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac_chromium_asan_rel_ng"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/mac_chromium_compile_dbg_ng"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/mac_chromium_compile_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac_chromium_dbg_ng"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/mac_optional_gpu_tests_rel"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
@@ -309,20 +1178,136 @@ config_groups: <
         location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
         location_regexp: ".+/[+]/tools/clang/scripts/update.py"
         location_regexp: ".+/[+]/ui/gl/.+"
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/mac_upload_clang"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/network_service_linux"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/tricium-metrics-analysis"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/try-nougat-phone-tester"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win-angle-deqp-rel-32"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win-angle-deqp-rel-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win-angle-rel-32"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win-angle-rel-64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win-annotator-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win-asan"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win-celab-try-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win-dawn-rel"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/win-libfuzzer-asan-rel"
         cancel_stale: NO
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/win-swangle-chromium-try-x86"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win-swangle-try-tot-angle-x64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win-swangle-try-tot-angle-x86"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win-swangle-try-tot-swiftshader-x64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win-swangle-try-tot-swiftshader-x86"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win-swangle-try-x64"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win-swangle-try-x86"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win10-blink-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win10_chromium_x64_dbg_ng"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/win10_chromium_x64_rel_ng"
         cancel_stale: NO
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/win10_chromium_x64_rel_ng_exp"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win7-blink-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win7-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win_archive"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/win_chromium_compile_dbg_ng"
         cancel_stale: NO
-      >
-      builders: <
+      }
+      builders {
+        name: "chromium/try/win_chromium_compile_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win_chromium_dbg_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win_chromium_x64_rel_ng"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win_mojo"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/win_optional_gpu_tests_rel"
         location_regexp: ".+/[+]/chrome/browser/vr/.+"
         location_regexp: ".+/[+]/content/browser/xr/.+"
@@ -340,14 +1325,741 @@ config_groups: <
         location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
         location_regexp: ".+/[+]/tools/clang/scripts/update.py"
         location_regexp: ".+/[+]/ui/gl/.+"
-      >
-      retry_config: <
+      }
+      builders {
+        name: "chromium/try/win_upload_clang"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/win_x64_archive"
+        includable_only: true
+      }
+      retry_config {
+        single_quota: 1
+        global_quota: 2
+        failure_weight: 1
+        transient_failure_weight: 1
+        timeout_weight: 2
+      }
+    }
+  }
+}
+config_groups {
+  name: "cq-m83"
+  gerrit {
+    url: "https://chromium-review.googlesource.com"
+    projects {
+      name: "chromium/src"
+      ref_regexp: "refs/branch-heads/4103"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-chromium-committers"
+      dry_run_access_list: "project-chromium-tryjob-access"
+    }
+    tryjob {
+      builders {
+        name: "chromium/try-m83/android-binary-size"
+      }
+      builders {
+        name: "chromium/try-m83/android-cronet-arm-dbg"
+        location_regexp: ".+/[+]/components/cronet/.+"
+        location_regexp: ".+/[+]/components/grpc_support/.+"
+        location_regexp: ".+/[+]/build/android/.+"
+        location_regexp: ".+/[+]/build/config/android/.+"
+        location_regexp_exclude: ".+/[+]/components/cronet/ios/.+"
+      }
+      builders {
+        name: "chromium/try-m83/android-lollipop-arm-rel"
+      }
+      builders {
+        name: "chromium/try-m83/android-marshmallow-arm64-rel"
+      }
+      builders {
+        name: "chromium/try-m83/android-pie-arm64-dbg"
+        location_regexp: ".+/[+]/chrome/android/features/vr/.+"
+        location_regexp: ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/chrome/android/javatests/src/org/chromium/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/third_party/gvr-android-sdk/.+"
+        location_regexp: ".+/[+]/third_party/arcore-android-sdk/.+"
+        location_regexp: ".+/[+]/third_party/arcore-android-sdk-client/.+"
+      }
+      builders {
+        name: "chromium/try-m83/android-pie-arm64-rel"
+      }
+      builders {
+        name: "chromium/try-m83/android_compile_dbg"
+      }
+      builders {
+        name: "chromium/try-m83/android_compile_x64_dbg"
+        location_regexp: ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/sandbox/linux/seccomp-bpf/.+"
+        location_regexp: ".+/[+]/sandbox/linux/seccomp-bpf-helpers/.+"
+        location_regexp: ".+/[+]/sandbox/linux/system_headers/.+"
+        location_regexp: ".+/[+]/sandbox/linux/tests/.+"
+        location_regexp: ".+/[+]/third_party/gvr-android-sdk/.+"
+      }
+      builders {
+        name: "chromium/try-m83/android_compile_x86_dbg"
+        location_regexp: ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/sandbox/linux/seccomp-bpf/.+"
+        location_regexp: ".+/[+]/sandbox/linux/seccomp-bpf-helpers/.+"
+        location_regexp: ".+/[+]/sandbox/linux/system_headers/.+"
+        location_regexp: ".+/[+]/sandbox/linux/tests/.+"
+        location_regexp: ".+/[+]/third_party/gvr-android-sdk/.+"
+      }
+      builders {
+        name: "chromium/try-m83/android_cronet"
+      }
+      builders {
+        name: "chromium/try-m83/android_optional_gpu_tests_rel"
+        location_regexp: ".+/[+]/cc/.+"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/components/viz/.+"
+        location_regexp: ".+/[+]/content/test/gpu/.+"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/media/audio/.+"
+        location_regexp: ".+/[+]/media/filters/.+"
+        location_regexp: ".+/[+]/media/gpu/.+"
+        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: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/.+"
+      }
+      builders {
+        name: "chromium/try-m83/cast_shell_android"
+      }
+      builders {
+        name: "chromium/try-m83/cast_shell_linux"
+      }
+      builders {
+        name: "chromium/try-m83/chromeos-amd64-generic-dbg"
+        location_regexp: ".+/[+]/content/gpu/.+"
+        location_regexp: ".+/[+]/media/.+"
+      }
+      builders {
+        name: "chromium/try-m83/chromeos-amd64-generic-rel"
+      }
+      builders {
+        name: "chromium/try-m83/chromeos-arm-generic-rel"
+      }
+      builders {
+        name: "chromium/try-m83/chromium_presubmit"
+        disable_reuse: true
+      }
+      builders {
+        name: "chromium/try-m83/closure_compilation"
+        location_regexp: ".+/[+]/third_party/closure_compiler/.+"
+      }
+      builders {
+        name: "chromium/try-m83/dawn-linux-x64-deps-rel"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/WebGPUExpectations"
+        location_regexp: ".+/[+]/third_party/dawn/.+"
+        location_regexp: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/features.gni"
+      }
+      builders {
+        name: "chromium/try-m83/dawn-mac-x64-deps-rel"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/WebGPUExpectations"
+        location_regexp: ".+/[+]/third_party/dawn/.+"
+        location_regexp: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/features.gni"
+      }
+      builders {
+        name: "chromium/try-m83/dawn-win10-x64-deps-rel"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/WebGPUExpectations"
+        location_regexp: ".+/[+]/third_party/dawn/.+"
+        location_regexp: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/features.gni"
+      }
+      builders {
+        name: "chromium/try-m83/dawn-win10-x86-deps-rel"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/WebGPUExpectations"
+        location_regexp: ".+/[+]/third_party/dawn/.+"
+        location_regexp: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/features.gni"
+      }
+      builders {
+        name: "chromium/try-m83/fuchsia-arm64-cast"
+        location_regexp: ".+/[+]/chromecast/.+"
+      }
+      builders {
+        name: "chromium/try-m83/fuchsia-x64-cast"
+      }
+      builders {
+        name: "chromium/try-m83/fuchsia_arm64"
+      }
+      builders {
+        name: "chromium/try-m83/fuchsia_x64"
+      }
+      builders {
+        name: "chromium/try-m83/ios-simulator"
+      }
+      builders {
+        name: "chromium/try-m83/ios-simulator-cronet"
+        location_regexp: ".+/[+]/components/cronet/.+"
+        location_regexp: ".+/[+]/components/grpc_support/.+"
+        location_regexp: ".+/[+]/ios/.+"
+        location_regexp_exclude: ".+/[+]/components/cronet/android/.+"
+      }
+      builders {
+        name: "chromium/try-m83/ios-simulator-full-configs"
+        location_regexp: ".+/[+]/ios/.+"
+      }
+      builders {
+        name: "chromium/try-m83/linux-blink-rel"
+        location_regexp: ".+/[+]/cc/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/paint/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/svg/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/.+"
+      }
+      builders {
+        name: "chromium/try-m83/linux-chromeos-compile-dbg"
+      }
+      builders {
+        name: "chromium/try-m83/linux-chromeos-rel"
+        cancel_stale: NO
+      }
+      builders {
+        name: "chromium/try-m83/linux-libfuzzer-asan-rel"
+      }
+      builders {
+        name: "chromium/try-m83/linux-ozone-rel"
+      }
+      builders {
+        name: "chromium/try-m83/linux-rel"
+      }
+      builders {
+        name: "chromium/try-m83/linux_chromium_asan_rel_ng"
+      }
+      builders {
+        name: "chromium/try-m83/linux_chromium_compile_dbg_ng"
+      }
+      builders {
+        name: "chromium/try-m83/linux_chromium_dbg_ng"
+        location_regexp: ".+/[+]/build/.*check_gn_headers.*"
+      }
+      builders {
+        name: "chromium/try-m83/linux_chromium_tsan_rel_ng"
+      }
+      builders {
+        name: "chromium/try-m83/linux_layout_tests_composite_after_paint"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/paint/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/svg/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/.+"
+      }
+      builders {
+        name: "chromium/try-m83/linux_layout_tests_layout_ng_disabled"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/editing/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/layout/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/paint/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/svg/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/fonts/shaping/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/FlagExpectations/disable-layout-ng"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/flag-specific/disable-layout-ng/.+"
+      }
+      builders {
+        name: "chromium/try-m83/linux_optional_gpu_tests_rel"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/content/test/gpu/.+"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/media/audio/.+"
+        location_regexp: ".+/[+]/media/filters/.+"
+        location_regexp: ".+/[+]/media/gpu/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.gpu.fyi.json"
+        location_regexp: ".+/[+]/testing/trigger_scripts/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
+        location_regexp: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/.+"
+      }
+      builders {
+        name: "chromium/try-m83/linux_vr"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+      }
+      builders {
+        name: "chromium/try-m83/mac-rel"
+      }
+      builders {
+        name: "chromium/try-m83/mac_chromium_compile_dbg_ng"
+      }
+      builders {
+        name: "chromium/try-m83/mac_optional_gpu_tests_rel"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/content/test/gpu/.+"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/media/audio/.+"
+        location_regexp: ".+/[+]/media/filters/.+"
+        location_regexp: ".+/[+]/media/gpu/.+"
+        location_regexp: ".+/[+]/services/shape_detection/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.gpu.fyi.json"
+        location_regexp: ".+/[+]/testing/trigger_scripts/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
+        location_regexp: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/.+"
+      }
+      builders {
+        name: "chromium/try-m83/win-libfuzzer-asan-rel"
+        cancel_stale: NO
+      }
+      builders {
+        name: "chromium/try-m83/win10_chromium_x64_rel_ng"
+        cancel_stale: NO
+      }
+      builders {
+        name: "chromium/try-m83/win_chromium_compile_dbg_ng"
+        cancel_stale: NO
+      }
+      builders {
+        name: "chromium/try-m83/win_optional_gpu_tests_rel"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/content/test/gpu/.+"
+        location_regexp: ".+/[+]/device/vr/.+"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/media/audio/.+"
+        location_regexp: ".+/[+]/media/filters/.+"
+        location_regexp: ".+/[+]/media/gpu/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.gpu.fyi.json"
+        location_regexp: ".+/[+]/testing/trigger_scripts/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/vr/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/xr/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
+        location_regexp: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/.+"
+      }
+      retry_config {
+        single_quota: 1
+        global_quota: 2
+        failure_weight: 1
+        transient_failure_weight: 1
+        timeout_weight: 2
+      }
+    }
+  }
+}
+config_groups {
+  name: "cq-m84"
+  gerrit {
+    url: "https://chromium-review.googlesource.com"
+    projects {
+      name: "chromium/src"
+      ref_regexp: "refs/branch-heads/4147"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-chromium-committers"
+      dry_run_access_list: "project-chromium-tryjob-access"
+    }
+    tryjob {
+      builders {
+        name: "chrome/try/mac-chrome-beta"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/mac-chrome-stable"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/win-chrome-beta"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/win-chrome-stable"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/win64-chrome-beta"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chrome/try/win64-chrome-stable"
+        includable_only: true
+        owner_whitelist_group: "googlers"
+        owner_whitelist_group: "project-chromium-robot-committers"
+      }
+      builders {
+        name: "chromium/try-m84/android-binary-size"
+      }
+      builders {
+        name: "chromium/try-m84/android-cronet-arm-dbg"
+        location_regexp: ".+/[+]/components/cronet/.+"
+        location_regexp: ".+/[+]/components/grpc_support/.+"
+        location_regexp: ".+/[+]/build/android/.+"
+        location_regexp: ".+/[+]/build/config/android/.+"
+        location_regexp_exclude: ".+/[+]/components/cronet/ios/.+"
+      }
+      builders {
+        name: "chromium/try-m84/android-lollipop-arm-rel"
+      }
+      builders {
+        name: "chromium/try-m84/android-marshmallow-arm64-rel"
+      }
+      builders {
+        name: "chromium/try-m84/android-pie-arm64-dbg"
+        location_regexp: ".+/[+]/chrome/android/features/vr/.+"
+        location_regexp: ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/chrome/android/javatests/src/org/chromium/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/content/browser/xr/.+"
+        location_regexp: ".+/[+]/third_party/gvr-android-sdk/.+"
+        location_regexp: ".+/[+]/third_party/arcore-android-sdk/.+"
+        location_regexp: ".+/[+]/third_party/arcore-android-sdk-client/.+"
+      }
+      builders {
+        name: "chromium/try-m84/android-pie-arm64-rel"
+      }
+      builders {
+        name: "chromium/try-m84/android_compile_dbg"
+      }
+      builders {
+        name: "chromium/try-m84/android_compile_x64_dbg"
+        location_regexp: ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/content/browser/xr/.+"
+        location_regexp: ".+/[+]/sandbox/linux/seccomp-bpf/.+"
+        location_regexp: ".+/[+]/sandbox/linux/seccomp-bpf-helpers/.+"
+        location_regexp: ".+/[+]/sandbox/linux/system_headers/.+"
+        location_regexp: ".+/[+]/sandbox/linux/tests/.+"
+        location_regexp: ".+/[+]/third_party/gvr-android-sdk/.+"
+      }
+      builders {
+        name: "chromium/try-m84/android_compile_x86_dbg"
+        location_regexp: ".+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/content/browser/xr/.+"
+        location_regexp: ".+/[+]/sandbox/linux/seccomp-bpf/.+"
+        location_regexp: ".+/[+]/sandbox/linux/seccomp-bpf-helpers/.+"
+        location_regexp: ".+/[+]/sandbox/linux/system_headers/.+"
+        location_regexp: ".+/[+]/sandbox/linux/tests/.+"
+        location_regexp: ".+/[+]/third_party/gvr-android-sdk/.+"
+      }
+      builders {
+        name: "chromium/try-m84/android_cronet"
+      }
+      builders {
+        name: "chromium/try-m84/android_optional_gpu_tests_rel"
+        location_regexp: ".+/[+]/cc/.+"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/content/browser/xr/.+"
+        location_regexp: ".+/[+]/components/viz/.+"
+        location_regexp: ".+/[+]/content/test/gpu/.+"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/media/audio/.+"
+        location_regexp: ".+/[+]/media/filters/.+"
+        location_regexp: ".+/[+]/media/gpu/.+"
+        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: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/.+"
+      }
+      builders {
+        name: "chromium/try-m84/cast_shell_android"
+      }
+      builders {
+        name: "chromium/try-m84/cast_shell_linux"
+      }
+      builders {
+        name: "chromium/try-m84/chromeos-amd64-generic-dbg"
+        location_regexp: ".+/[+]/content/gpu/.+"
+        location_regexp: ".+/[+]/media/.+"
+      }
+      builders {
+        name: "chromium/try-m84/chromeos-amd64-generic-rel"
+      }
+      builders {
+        name: "chromium/try-m84/chromeos-arm-generic-rel"
+      }
+      builders {
+        name: "chromium/try-m84/chromium_presubmit"
+        disable_reuse: true
+      }
+      builders {
+        name: "chromium/try-m84/closure_compilation"
+        location_regexp: ".+/[+]/third_party/closure_compiler/.+"
+      }
+      builders {
+        name: "chromium/try-m84/dawn-linux-x64-deps-rel"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/WebGPUExpectations"
+        location_regexp: ".+/[+]/third_party/dawn/.+"
+        location_regexp: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/features.gni"
+      }
+      builders {
+        name: "chromium/try-m84/dawn-mac-x64-deps-rel"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/WebGPUExpectations"
+        location_regexp: ".+/[+]/third_party/dawn/.+"
+        location_regexp: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/features.gni"
+      }
+      builders {
+        name: "chromium/try-m84/dawn-win10-x64-deps-rel"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/WebGPUExpectations"
+        location_regexp: ".+/[+]/third_party/dawn/.+"
+        location_regexp: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/features.gni"
+      }
+      builders {
+        name: "chromium/try-m84/dawn-win10-x86-deps-rel"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/WebGPUExpectations"
+        location_regexp: ".+/[+]/third_party/dawn/.+"
+        location_regexp: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/features.gni"
+      }
+      builders {
+        name: "chromium/try-m84/fuchsia-arm64-cast"
+        location_regexp: ".+/[+]/chromecast/.+"
+      }
+      builders {
+        name: "chromium/try-m84/fuchsia-x64-cast"
+      }
+      builders {
+        name: "chromium/try-m84/fuchsia_arm64"
+      }
+      builders {
+        name: "chromium/try-m84/fuchsia_x64"
+      }
+      builders {
+        name: "chromium/try-m84/ios-simulator"
+      }
+      builders {
+        name: "chromium/try-m84/ios-simulator-cronet"
+        location_regexp: ".+/[+]/components/cronet/.+"
+        location_regexp: ".+/[+]/components/grpc_support/.+"
+        location_regexp: ".+/[+]/ios/.+"
+        location_regexp_exclude: ".+/[+]/components/cronet/android/.+"
+      }
+      builders {
+        name: "chromium/try-m84/ios-simulator-full-configs"
+        location_regexp: ".+/[+]/ios/.+"
+      }
+      builders {
+        name: "chromium/try-m84/linux-blink-rel"
+        location_regexp: ".+/[+]/cc/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/paint/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/svg/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/.+"
+      }
+      builders {
+        name: "chromium/try-m84/linux-chromeos-compile-dbg"
+      }
+      builders {
+        name: "chromium/try-m84/linux-chromeos-rel"
+        cancel_stale: NO
+      }
+      builders {
+        name: "chromium/try-m84/linux-libfuzzer-asan-rel"
+      }
+      builders {
+        name: "chromium/try-m84/linux-ozone-rel"
+      }
+      builders {
+        name: "chromium/try-m84/linux-rel"
+      }
+      builders {
+        name: "chromium/try-m84/linux_chromium_asan_rel_ng"
+      }
+      builders {
+        name: "chromium/try-m84/linux_chromium_compile_dbg_ng"
+      }
+      builders {
+        name: "chromium/try-m84/linux_chromium_dbg_ng"
+        location_regexp: ".+/[+]/build/.*check_gn_headers.*"
+      }
+      builders {
+        name: "chromium/try-m84/linux_chromium_tsan_rel_ng"
+      }
+      builders {
+        name: "chromium/try-m84/linux_layout_tests_composite_after_paint"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/paint/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/svg/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/.+"
+      }
+      builders {
+        name: "chromium/try-m84/linux_layout_tests_layout_ng_disabled"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/editing/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/layout/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/paint/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/core/svg/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/fonts/shaping/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/FlagExpectations/disable-layout-ng"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/flag-specific/disable-layout-ng/.+"
+      }
+      builders {
+        name: "chromium/try-m84/linux_optional_gpu_tests_rel"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/content/browser/xr/.+"
+        location_regexp: ".+/[+]/content/test/gpu/.+"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/media/audio/.+"
+        location_regexp: ".+/[+]/media/filters/.+"
+        location_regexp: ".+/[+]/media/gpu/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.gpu.fyi.json"
+        location_regexp: ".+/[+]/testing/trigger_scripts/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
+        location_regexp: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/.+"
+      }
+      builders {
+        name: "chromium/try-m84/linux_vr"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/content/browser/xr/.+"
+      }
+      builders {
+        name: "chromium/try-m84/mac-rel"
+      }
+      builders {
+        name: "chromium/try-m84/mac_chromium_compile_dbg_ng"
+      }
+      builders {
+        name: "chromium/try-m84/mac_optional_gpu_tests_rel"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/content/browser/xr/.+"
+        location_regexp: ".+/[+]/content/test/gpu/.+"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/media/audio/.+"
+        location_regexp: ".+/[+]/media/filters/.+"
+        location_regexp: ".+/[+]/media/gpu/.+"
+        location_regexp: ".+/[+]/services/shape_detection/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.gpu.fyi.json"
+        location_regexp: ".+/[+]/testing/trigger_scripts/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
+        location_regexp: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/.+"
+      }
+      builders {
+        name: "chromium/try-m84/win-libfuzzer-asan-rel"
+        cancel_stale: NO
+      }
+      builders {
+        name: "chromium/try-m84/win10_chromium_x64_rel_ng"
+        cancel_stale: NO
+      }
+      builders {
+        name: "chromium/try-m84/win_chromium_compile_dbg_ng"
+        cancel_stale: NO
+      }
+      builders {
+        name: "chromium/try-m84/win_optional_gpu_tests_rel"
+        location_regexp: ".+/[+]/chrome/browser/vr/.+"
+        location_regexp: ".+/[+]/content/browser/xr/.+"
+        location_regexp: ".+/[+]/content/test/gpu/.+"
+        location_regexp: ".+/[+]/device/vr/.+"
+        location_regexp: ".+/[+]/gpu/.+"
+        location_regexp: ".+/[+]/media/audio/.+"
+        location_regexp: ".+/[+]/media/filters/.+"
+        location_regexp: ".+/[+]/media/gpu/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.gpu.fyi.json"
+        location_regexp: ".+/[+]/testing/trigger_scripts/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/vr/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/modules/xr/.+"
+        location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
+        location_regexp: ".+/[+]/tools/clang/scripts/update.py"
+        location_regexp: ".+/[+]/ui/gl/.+"
+      }
+      retry_config {
         single_quota: 1
         global_quota: 2
         failure_weight: 1
         transient_failure_weight: 1
         timeout_weight: 2
-      >
-    >
-  >
->
+      }
+    }
+  }
+}
+config_groups {
+  name: "fallback-empty-cq"
+  gerrit {
+    url: "https://chromium-review.googlesource.com"
+    projects {
+      name: "chromium/src"
+      ref_regexp: "refs/branch-heads/.*\\D.*"
+      ref_regexp: "refs/branch-heads/[1-9]\\d{0,2}"
+      ref_regexp: "refs/branch-heads/[1-3]\\d{3}"
+      ref_regexp: "refs/branch-heads/40\\d{2}"
+      ref_regexp: "refs/branch-heads/410[0-2]"
+      ref_regexp: "refs/branch-heads/410[4-9]"
+      ref_regexp: "refs/branch-heads/41[1-3]\\d"
+      ref_regexp: "refs/branch-heads/414[0-6]"
+      ref_regexp: "refs/branch-heads/414[8-9]"
+      ref_regexp: "refs/branch-heads/41[5-9]\\d"
+      ref_regexp: "refs/branch-heads/4[2-9]\\d{2}"
+      ref_regexp: "refs/branch-heads/[5-9]\\d{3}"
+      ref_regexp: "refs/branch-heads/[1-9]\\d{4,}"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-chromium-committers"
+      dry_run_access_list: "project-chromium-tryjob-access"
+    }
+  }
+  fallback: YES
+}
diff --git a/chromium/infra/config/generated/cq-builders.md b/chromium/infra/config/generated/cq-builders.md
new file mode 100644
index 00000000000..3c92c2af9fc
--- /dev/null
+++ b/chromium/infra/config/generated/cq-builders.md
@@ -0,0 +1,358 @@
+<!-- Auto-generated by lucicfg (via cq-builders-md.star). -->
+<!-- Do not modify manually. -->
+
+# List of CQ builders
+
+[TOC]
+
+Each builder name links to that builder on Milo. The "matching builders" links
+point to the file used to determine which configurations a builder should copy
+when running. These links might 404 or error; they are hard-coded right now,
+using common assumptions about how builders are configured.
+
+## Required builders
+These builders must pass before a CL may land.
+
+* [android-binary-size](https://ci.chromium.org/p/chromium/builders/try/android-binary-size) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android-binary-size)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android-binary-size))
+
+* [android-lollipop-arm-rel](https://ci.chromium.org/p/chromium/builders/try/android-lollipop-arm-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android-lollipop-arm-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android-lollipop-arm-rel))
+
+* [android-marshmallow-arm64-rel](https://ci.chromium.org/p/chromium/builders/try/android-marshmallow-arm64-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android-marshmallow-arm64-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android-marshmallow-arm64-rel))
+
+* [android-pie-arm64-rel](https://ci.chromium.org/p/chromium/builders/try/android-pie-arm64-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android-pie-arm64-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android-pie-arm64-rel))
+
+* [android_compile_dbg](https://ci.chromium.org/p/chromium/builders/try/android_compile_dbg) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android_compile_dbg)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android_compile_dbg))
+
+* [android_cronet](https://ci.chromium.org/p/chromium/builders/try/android_cronet) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android_cronet)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android_cronet))
+
+* [cast_shell_android](https://ci.chromium.org/p/chromium/builders/try/cast_shell_android) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+cast_shell_android)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+cast_shell_android))
+
+* [cast_shell_linux](https://ci.chromium.org/p/chromium/builders/try/cast_shell_linux) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+cast_shell_linux)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+cast_shell_linux))
+
+* [chromeos-amd64-generic-rel](https://ci.chromium.org/p/chromium/builders/try/chromeos-amd64-generic-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+chromeos-amd64-generic-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+chromeos-amd64-generic-rel))
+
+* [chromeos-arm-generic-rel](https://ci.chromium.org/p/chromium/builders/try/chromeos-arm-generic-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+chromeos-arm-generic-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+chromeos-arm-generic-rel))
+
+* [chromium_presubmit](https://ci.chromium.org/p/chromium/builders/try/chromium_presubmit) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+chromium_presubmit)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+chromium_presubmit))
+
+* [fuchsia-x64-cast](https://ci.chromium.org/p/chromium/builders/try/fuchsia-x64-cast) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+fuchsia-x64-cast)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+fuchsia-x64-cast))
+
+* [fuchsia_x64](https://ci.chromium.org/p/chromium/builders/try/fuchsia_x64) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+fuchsia_x64)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+fuchsia_x64))
+
+* [ios-simulator](https://ci.chromium.org/p/chromium/builders/try/ios-simulator) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+ios-simulator)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+ios-simulator))
+
+* [linux-chromeos-compile-dbg](https://ci.chromium.org/p/chromium/builders/try/linux-chromeos-compile-dbg) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-chromeos-compile-dbg)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-chromeos-compile-dbg))
+
+* [linux-chromeos-rel](https://ci.chromium.org/p/chromium/builders/try/linux-chromeos-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-chromeos-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-chromeos-rel))
+
+* [linux-libfuzzer-asan-rel](https://ci.chromium.org/p/chromium/builders/try/linux-libfuzzer-asan-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-libfuzzer-asan-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-libfuzzer-asan-rel))
+
+* [linux-ozone-rel](https://ci.chromium.org/p/chromium/builders/try/linux-ozone-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-ozone-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-ozone-rel))
+
+* [linux-rel](https://ci.chromium.org/p/chromium/builders/try/linux-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-rel))
+
+* [linux_chromium_asan_rel_ng](https://ci.chromium.org/p/chromium/builders/try/linux_chromium_asan_rel_ng) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux_chromium_asan_rel_ng)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux_chromium_asan_rel_ng))
+
+* [linux_chromium_compile_dbg_ng](https://ci.chromium.org/p/chromium/builders/try/linux_chromium_compile_dbg_ng) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux_chromium_compile_dbg_ng)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux_chromium_compile_dbg_ng))
+
+* [linux_chromium_tsan_rel_ng](https://ci.chromium.org/p/chromium/builders/try/linux_chromium_tsan_rel_ng) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux_chromium_tsan_rel_ng)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux_chromium_tsan_rel_ng))
+
+* [mac-rel](https://ci.chromium.org/p/chromium/builders/try/mac-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+mac-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+mac-rel))
+
+* [mac_chromium_compile_dbg_ng](https://ci.chromium.org/p/chromium/builders/try/mac_chromium_compile_dbg_ng) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+mac_chromium_compile_dbg_ng)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+mac_chromium_compile_dbg_ng))
+
+* [win-libfuzzer-asan-rel](https://ci.chromium.org/p/chromium/builders/try/win-libfuzzer-asan-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+win-libfuzzer-asan-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+win-libfuzzer-asan-rel))
+
+* [win10_chromium_x64_rel_ng](https://ci.chromium.org/p/chromium/builders/try/win10_chromium_x64_rel_ng) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+win10_chromium_x64_rel_ng)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+win10_chromium_x64_rel_ng))
+
+* [win_chromium_compile_dbg_ng](https://ci.chromium.org/p/chromium/builders/try/win_chromium_compile_dbg_ng) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+win_chromium_compile_dbg_ng)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+win_chromium_compile_dbg_ng))
+
+
+## Optional builders
+These builders optionally run, depending on the files in a CL. For example, a CL
+which touches `//gpu/BUILD.gn` would trigger the builder
+`android_optional_gpu_tests_rel`, due to the `location_regexp` values for that
+builder.
+
+* [android-cronet-arm-dbg](https://ci.chromium.org/p/chromium/builders/try/android-cronet-arm-dbg) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android-cronet-arm-dbg)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android-cronet-arm-dbg))
+
+  Path regular expressions:
+  * [`//components/cronet/.+`](https://cs.chromium.org/chromium/src/components/cronet/)
+  * [`//components/grpc_support/.+`](https://cs.chromium.org/chromium/src/components/grpc_support/)
+  * [`//build/android/.+`](https://cs.chromium.org/chromium/src/build/android/)
+  * [`//build/config/android/.+`](https://cs.chromium.org/chromium/src/build/config/android/)
+
+  Path exclude regular expressions:
+  * [`//components/cronet/ios/.+`](https://cs.chromium.org/chromium/src/components/cronet/ios/)
+
+* [android-pie-arm64-dbg](https://ci.chromium.org/p/chromium/builders/try/android-pie-arm64-dbg) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android-pie-arm64-dbg)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android-pie-arm64-dbg))
+
+  Path regular expressions:
+  * [`//chrome/android/features/vr/.+`](https://cs.chromium.org/chromium/src/chrome/android/features/vr/)
+  * [`//chrome/android/java/src/org/chromium/chrome/browser/vr/.+`](https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chrome/browser/vr/)
+  * [`//chrome/android/javatests/src/org/chromium/chrome/browser/vr/.+`](https://cs.chromium.org/chromium/src/chrome/android/javatests/src/org/chromium/chrome/browser/vr/)
+  * [`//chrome/browser/vr/.+`](https://cs.chromium.org/chromium/src/chrome/browser/vr/)
+  * [`//content/browser/xr/.+`](https://cs.chromium.org/chromium/src/content/browser/xr/)
+  * [`//third_party/gvr-android-sdk/.+`](https://cs.chromium.org/chromium/src/third_party/gvr-android-sdk/)
+  * [`//third_party/arcore-android-sdk/.+`](https://cs.chromium.org/chromium/src/third_party/arcore-android-sdk/)
+  * [`//third_party/arcore-android-sdk-client/.+`](https://cs.chromium.org/chromium/src/third_party/arcore-android-sdk-client/)
+
+* [android_compile_x64_dbg](https://ci.chromium.org/p/chromium/builders/try/android_compile_x64_dbg) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android_compile_x64_dbg)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android_compile_x64_dbg))
+
+  Path regular expressions:
+  * [`//chrome/android/java/src/org/chromium/chrome/browser/vr/.+`](https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chrome/browser/vr/)
+  * [`//chrome/browser/vr/.+`](https://cs.chromium.org/chromium/src/chrome/browser/vr/)
+  * [`//content/browser/xr/.+`](https://cs.chromium.org/chromium/src/content/browser/xr/)
+  * [`//sandbox/linux/seccomp-bpf/.+`](https://cs.chromium.org/chromium/src/sandbox/linux/seccomp-bpf/)
+  * [`//sandbox/linux/seccomp-bpf-helpers/.+`](https://cs.chromium.org/chromium/src/sandbox/linux/seccomp-bpf-helpers/)
+  * [`//sandbox/linux/system_headers/.+`](https://cs.chromium.org/chromium/src/sandbox/linux/system_headers/)
+  * [`//sandbox/linux/tests/.+`](https://cs.chromium.org/chromium/src/sandbox/linux/tests/)
+  * [`//third_party/gvr-android-sdk/.+`](https://cs.chromium.org/chromium/src/third_party/gvr-android-sdk/)
+
+* [android_compile_x86_dbg](https://ci.chromium.org/p/chromium/builders/try/android_compile_x86_dbg) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android_compile_x86_dbg)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android_compile_x86_dbg))
+
+  Path regular expressions:
+  * [`//chrome/android/java/src/org/chromium/chrome/browser/vr/.+`](https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chrome/browser/vr/)
+  * [`//chrome/browser/vr/.+`](https://cs.chromium.org/chromium/src/chrome/browser/vr/)
+  * [`//content/browser/xr/.+`](https://cs.chromium.org/chromium/src/content/browser/xr/)
+  * [`//sandbox/linux/seccomp-bpf/.+`](https://cs.chromium.org/chromium/src/sandbox/linux/seccomp-bpf/)
+  * [`//sandbox/linux/seccomp-bpf-helpers/.+`](https://cs.chromium.org/chromium/src/sandbox/linux/seccomp-bpf-helpers/)
+  * [`//sandbox/linux/system_headers/.+`](https://cs.chromium.org/chromium/src/sandbox/linux/system_headers/)
+  * [`//sandbox/linux/tests/.+`](https://cs.chromium.org/chromium/src/sandbox/linux/tests/)
+  * [`//third_party/gvr-android-sdk/.+`](https://cs.chromium.org/chromium/src/third_party/gvr-android-sdk/)
+
+* [android_optional_gpu_tests_rel](https://ci.chromium.org/p/chromium/builders/try/android_optional_gpu_tests_rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android_optional_gpu_tests_rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android_optional_gpu_tests_rel))
+
+  Path regular expressions:
+  * [`//cc/.+`](https://cs.chromium.org/chromium/src/cc/)
+  * [`//chrome/browser/vr/.+`](https://cs.chromium.org/chromium/src/chrome/browser/vr/)
+  * [`//content/browser/xr/.+`](https://cs.chromium.org/chromium/src/content/browser/xr/)
+  * [`//components/viz/.+`](https://cs.chromium.org/chromium/src/components/viz/)
+  * [`//content/test/gpu/.+`](https://cs.chromium.org/chromium/src/content/test/gpu/)
+  * [`//gpu/.+`](https://cs.chromium.org/chromium/src/gpu/)
+  * [`//media/audio/.+`](https://cs.chromium.org/chromium/src/media/audio/)
+  * [`//media/filters/.+`](https://cs.chromium.org/chromium/src/media/filters/)
+  * [`//media/gpu/.+`](https://cs.chromium.org/chromium/src/media/gpu/)
+  * [`//services/viz/.+`](https://cs.chromium.org/chromium/src/services/viz/)
+  * [`//testing/trigger_scripts/.+`](https://cs.chromium.org/chromium/src/testing/trigger_scripts/)
+  * [`//third_party/blink/renderer/modules/webgl/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgl/)
+  * [`//third_party/blink/renderer/platform/graphics/gpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/graphics/gpu/)
+  * [`//tools/clang/scripts/update.py`](https://cs.chromium.org/search?q=package:%5Echromium$+file:tools/clang/scripts/update.py)
+  * [`//ui/gl/.+`](https://cs.chromium.org/chromium/src/ui/gl/)
+
+* [chromeos-amd64-generic-dbg](https://ci.chromium.org/p/chromium/builders/try/chromeos-amd64-generic-dbg) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+chromeos-amd64-generic-dbg)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+chromeos-amd64-generic-dbg))
+
+  Path regular expressions:
+  * [`//content/gpu/.+`](https://cs.chromium.org/chromium/src/content/gpu/)
+  * [`//media/.+`](https://cs.chromium.org/chromium/src/media/)
+
+* [chromeos-kevin-compile-rel](https://ci.chromium.org/p/chromium/builders/try/chromeos-kevin-compile-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+chromeos-kevin-compile-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+chromeos-kevin-compile-rel))
+
+  Path regular expressions:
+  * [`//chromeos/CHROMEOS_LKGM`](https://cs.chromium.org/chromium/src/chromeos/CHROMEOS_LKGM)
+
+* [chromeos-kevin-rel](https://ci.chromium.org/p/chromium/builders/try/chromeos-kevin-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+chromeos-kevin-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+chromeos-kevin-rel))
+
+  Path regular expressions:
+  * [`//build/chromeos/.+`](https://cs.chromium.org/chromium/src/build/chromeos/)
+  * [`//build/config/chromeos/.*`](https://cs.chromium.org/search?q=package:%5Echromium$+file:build/config/chromeos/.*)
+
+* [closure_compilation](https://ci.chromium.org/p/chromium/builders/try/closure_compilation) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+closure_compilation)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+closure_compilation))
+
+  Path regular expressions:
+  * [`//third_party/closure_compiler/.+`](https://cs.chromium.org/chromium/src/third_party/closure_compiler/)
+
+* [dawn-linux-x64-deps-rel](https://ci.chromium.org/p/chromium/builders/try/dawn-linux-x64-deps-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+dawn-linux-x64-deps-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+dawn-linux-x64-deps-rel))
+
+  Path regular expressions:
+  * [`//gpu/.+`](https://cs.chromium.org/chromium/src/gpu/)
+  * [`//testing/buildbot/chromium.dawn.json`](https://cs.chromium.org/search?q=package:%5Echromium$+file:testing/buildbot/chromium.dawn.json)
+  * [`//third_party/blink/renderer/modules/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgpu/)
+  * [`//third_party/blink/web_tests/external/wpt/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/external/wpt/webgpu/)
+  * [`//third_party/blink/web_tests/wpt_internal/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/wpt_internal/webgpu/)
+  * [`//third_party/blink/web_tests/WebGPUExpectations`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/WebGPUExpectations)
+  * [`//third_party/dawn/.+`](https://cs.chromium.org/chromium/src/third_party/dawn/)
+  * [`//tools/clang/scripts/update.py`](https://cs.chromium.org/search?q=package:%5Echromium$+file:tools/clang/scripts/update.py)
+  * [`//ui/gl/features.gni`](https://cs.chromium.org/search?q=package:%5Echromium$+file:ui/gl/features.gni)
+
+* [dawn-mac-x64-deps-rel](https://ci.chromium.org/p/chromium/builders/try/dawn-mac-x64-deps-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+dawn-mac-x64-deps-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+dawn-mac-x64-deps-rel))
+
+  Path regular expressions:
+  * [`//gpu/.+`](https://cs.chromium.org/chromium/src/gpu/)
+  * [`//testing/buildbot/chromium.dawn.json`](https://cs.chromium.org/search?q=package:%5Echromium$+file:testing/buildbot/chromium.dawn.json)
+  * [`//third_party/blink/renderer/modules/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgpu/)
+  * [`//third_party/blink/web_tests/external/wpt/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/external/wpt/webgpu/)
+  * [`//third_party/blink/web_tests/wpt_internal/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/wpt_internal/webgpu/)
+  * [`//third_party/blink/web_tests/WebGPUExpectations`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/WebGPUExpectations)
+  * [`//third_party/dawn/.+`](https://cs.chromium.org/chromium/src/third_party/dawn/)
+  * [`//tools/clang/scripts/update.py`](https://cs.chromium.org/search?q=package:%5Echromium$+file:tools/clang/scripts/update.py)
+  * [`//ui/gl/features.gni`](https://cs.chromium.org/search?q=package:%5Echromium$+file:ui/gl/features.gni)
+
+* [dawn-win10-x64-deps-rel](https://ci.chromium.org/p/chromium/builders/try/dawn-win10-x64-deps-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+dawn-win10-x64-deps-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+dawn-win10-x64-deps-rel))
+
+  Path regular expressions:
+  * [`//gpu/.+`](https://cs.chromium.org/chromium/src/gpu/)
+  * [`//testing/buildbot/chromium.dawn.json`](https://cs.chromium.org/search?q=package:%5Echromium$+file:testing/buildbot/chromium.dawn.json)
+  * [`//third_party/blink/renderer/modules/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgpu/)
+  * [`//third_party/blink/web_tests/external/wpt/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/external/wpt/webgpu/)
+  * [`//third_party/blink/web_tests/wpt_internal/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/wpt_internal/webgpu/)
+  * [`//third_party/blink/web_tests/WebGPUExpectations`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/WebGPUExpectations)
+  * [`//third_party/dawn/.+`](https://cs.chromium.org/chromium/src/third_party/dawn/)
+  * [`//tools/clang/scripts/update.py`](https://cs.chromium.org/search?q=package:%5Echromium$+file:tools/clang/scripts/update.py)
+  * [`//ui/gl/features.gni`](https://cs.chromium.org/search?q=package:%5Echromium$+file:ui/gl/features.gni)
+
+* [dawn-win10-x86-deps-rel](https://ci.chromium.org/p/chromium/builders/try/dawn-win10-x86-deps-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+dawn-win10-x86-deps-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+dawn-win10-x86-deps-rel))
+
+  Path regular expressions:
+  * [`//gpu/.+`](https://cs.chromium.org/chromium/src/gpu/)
+  * [`//testing/buildbot/chromium.dawn.json`](https://cs.chromium.org/search?q=package:%5Echromium$+file:testing/buildbot/chromium.dawn.json)
+  * [`//third_party/blink/renderer/modules/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgpu/)
+  * [`//third_party/blink/web_tests/external/wpt/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/external/wpt/webgpu/)
+  * [`//third_party/blink/web_tests/wpt_internal/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/wpt_internal/webgpu/)
+  * [`//third_party/blink/web_tests/WebGPUExpectations`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/WebGPUExpectations)
+  * [`//third_party/dawn/.+`](https://cs.chromium.org/chromium/src/third_party/dawn/)
+  * [`//tools/clang/scripts/update.py`](https://cs.chromium.org/search?q=package:%5Echromium$+file:tools/clang/scripts/update.py)
+  * [`//ui/gl/features.gni`](https://cs.chromium.org/search?q=package:%5Echromium$+file:ui/gl/features.gni)
+
+* [fuchsia-arm64-cast](https://ci.chromium.org/p/chromium/builders/try/fuchsia-arm64-cast) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+fuchsia-arm64-cast)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+fuchsia-arm64-cast))
+
+  Path regular expressions:
+  * [`//chromecast/.+`](https://cs.chromium.org/chromium/src/chromecast/)
+
+* [ios-simulator-cronet](https://ci.chromium.org/p/chromium/builders/try/ios-simulator-cronet) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+ios-simulator-cronet)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+ios-simulator-cronet))
+
+  Path regular expressions:
+  * [`//components/cronet/.+`](https://cs.chromium.org/chromium/src/components/cronet/)
+  * [`//components/grpc_support/.+`](https://cs.chromium.org/chromium/src/components/grpc_support/)
+  * [`//ios/.+`](https://cs.chromium.org/chromium/src/ios/)
+
+  Path exclude regular expressions:
+  * [`//components/cronet/android/.+`](https://cs.chromium.org/chromium/src/components/cronet/android/)
+
+* [ios-simulator-full-configs](https://ci.chromium.org/p/chromium/builders/try/ios-simulator-full-configs) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+ios-simulator-full-configs)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+ios-simulator-full-configs))
+
+  Path regular expressions:
+  * [`//ios/.+`](https://cs.chromium.org/chromium/src/ios/)
+
+* [linux-blink-rel](https://ci.chromium.org/p/chromium/builders/try/linux-blink-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-blink-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-blink-rel))
+
+  Path regular expressions:
+  * [`//cc/.+`](https://cs.chromium.org/chromium/src/cc/)
+  * [`//third_party/blink/renderer/core/paint/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/core/paint/)
+  * [`//third_party/blink/renderer/core/svg/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/core/svg/)
+  * [`//third_party/blink/renderer/platform/graphics/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/graphics/)
+
+* [linux_chromium_dbg_ng](https://ci.chromium.org/p/chromium/builders/try/linux_chromium_dbg_ng) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux_chromium_dbg_ng)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux_chromium_dbg_ng))
+
+  Path regular expressions:
+  * [`//build/.*check_gn_headers.*`](https://cs.chromium.org/search?q=package:%5Echromium$+file:build/.*check_gn_headers.*)
+
+* [linux_layout_tests_composite_after_paint](https://ci.chromium.org/p/chromium/builders/try/linux_layout_tests_composite_after_paint) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux_layout_tests_composite_after_paint)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux_layout_tests_composite_after_paint))
+
+  Path regular expressions:
+  * [`//third_party/blink/renderer/core/paint/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/core/paint/)
+  * [`//third_party/blink/renderer/core/svg/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/core/svg/)
+  * [`//third_party/blink/renderer/platform/graphics/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/graphics/)
+  * [`//third_party/blink/web_tests/.+`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/)
+
+* [linux_layout_tests_layout_ng_disabled](https://ci.chromium.org/p/chromium/builders/try/linux_layout_tests_layout_ng_disabled) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux_layout_tests_layout_ng_disabled)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux_layout_tests_layout_ng_disabled))
+
+  Path regular expressions:
+  * [`//third_party/blink/renderer/core/editing/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/core/editing/)
+  * [`//third_party/blink/renderer/core/layout/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/core/layout/)
+  * [`//third_party/blink/renderer/core/paint/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/core/paint/)
+  * [`//third_party/blink/renderer/core/svg/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/core/svg/)
+  * [`//third_party/blink/renderer/platform/fonts/shaping/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/fonts/shaping/)
+  * [`//third_party/blink/renderer/platform/graphics/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/graphics/)
+  * [`//third_party/blink/web_tests/FlagExpectations/disable-layout-ng`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/FlagExpectations/disable-layout-ng)
+  * [`//third_party/blink/web_tests/flag-specific/disable-layout-ng/.+`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/flag-specific/disable-layout-ng/)
+
+* [linux_optional_gpu_tests_rel](https://ci.chromium.org/p/chromium/builders/try/linux_optional_gpu_tests_rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux_optional_gpu_tests_rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux_optional_gpu_tests_rel))
+
+  Path regular expressions:
+  * [`//chrome/browser/vr/.+`](https://cs.chromium.org/chromium/src/chrome/browser/vr/)
+  * [`//content/browser/xr/.+`](https://cs.chromium.org/chromium/src/content/browser/xr/)
+  * [`//content/test/gpu/.+`](https://cs.chromium.org/chromium/src/content/test/gpu/)
+  * [`//gpu/.+`](https://cs.chromium.org/chromium/src/gpu/)
+  * [`//media/audio/.+`](https://cs.chromium.org/chromium/src/media/audio/)
+  * [`//media/filters/.+`](https://cs.chromium.org/chromium/src/media/filters/)
+  * [`//media/gpu/.+`](https://cs.chromium.org/chromium/src/media/gpu/)
+  * [`//testing/buildbot/chromium.gpu.fyi.json`](https://cs.chromium.org/search?q=package:%5Echromium$+file:testing/buildbot/chromium.gpu.fyi.json)
+  * [`//testing/trigger_scripts/.+`](https://cs.chromium.org/chromium/src/testing/trigger_scripts/)
+  * [`//third_party/blink/renderer/modules/webgl/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgl/)
+  * [`//third_party/blink/renderer/platform/graphics/gpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/graphics/gpu/)
+  * [`//tools/clang/scripts/update.py`](https://cs.chromium.org/search?q=package:%5Echromium$+file:tools/clang/scripts/update.py)
+  * [`//ui/gl/.+`](https://cs.chromium.org/chromium/src/ui/gl/)
+
+* [linux_vr](https://ci.chromium.org/p/chromium/builders/try/linux_vr) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux_vr)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux_vr))
+
+  Path regular expressions:
+  * [`//chrome/browser/vr/.+`](https://cs.chromium.org/chromium/src/chrome/browser/vr/)
+  * [`//content/browser/xr/.+`](https://cs.chromium.org/chromium/src/content/browser/xr/)
+
+* [mac_optional_gpu_tests_rel](https://ci.chromium.org/p/chromium/builders/try/mac_optional_gpu_tests_rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+mac_optional_gpu_tests_rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+mac_optional_gpu_tests_rel))
+
+  Path regular expressions:
+  * [`//chrome/browser/vr/.+`](https://cs.chromium.org/chromium/src/chrome/browser/vr/)
+  * [`//content/browser/xr/.+`](https://cs.chromium.org/chromium/src/content/browser/xr/)
+  * [`//content/test/gpu/.+`](https://cs.chromium.org/chromium/src/content/test/gpu/)
+  * [`//gpu/.+`](https://cs.chromium.org/chromium/src/gpu/)
+  * [`//media/audio/.+`](https://cs.chromium.org/chromium/src/media/audio/)
+  * [`//media/filters/.+`](https://cs.chromium.org/chromium/src/media/filters/)
+  * [`//media/gpu/.+`](https://cs.chromium.org/chromium/src/media/gpu/)
+  * [`//services/shape_detection/.+`](https://cs.chromium.org/chromium/src/services/shape_detection/)
+  * [`//testing/buildbot/chromium.gpu.fyi.json`](https://cs.chromium.org/search?q=package:%5Echromium$+file:testing/buildbot/chromium.gpu.fyi.json)
+  * [`//testing/trigger_scripts/.+`](https://cs.chromium.org/chromium/src/testing/trigger_scripts/)
+  * [`//third_party/blink/renderer/modules/webgl/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgl/)
+  * [`//third_party/blink/renderer/platform/graphics/gpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/graphics/gpu/)
+  * [`//tools/clang/scripts/update.py`](https://cs.chromium.org/search?q=package:%5Echromium$+file:tools/clang/scripts/update.py)
+  * [`//ui/gl/.+`](https://cs.chromium.org/chromium/src/ui/gl/)
+
+* [win_optional_gpu_tests_rel](https://ci.chromium.org/p/chromium/builders/try/win_optional_gpu_tests_rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+win_optional_gpu_tests_rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+win_optional_gpu_tests_rel))
+
+  Path regular expressions:
+  * [`//chrome/browser/vr/.+`](https://cs.chromium.org/chromium/src/chrome/browser/vr/)
+  * [`//content/browser/xr/.+`](https://cs.chromium.org/chromium/src/content/browser/xr/)
+  * [`//content/test/gpu/.+`](https://cs.chromium.org/chromium/src/content/test/gpu/)
+  * [`//device/vr/.+`](https://cs.chromium.org/chromium/src/device/vr/)
+  * [`//gpu/.+`](https://cs.chromium.org/chromium/src/gpu/)
+  * [`//media/audio/.+`](https://cs.chromium.org/chromium/src/media/audio/)
+  * [`//media/filters/.+`](https://cs.chromium.org/chromium/src/media/filters/)
+  * [`//media/gpu/.+`](https://cs.chromium.org/chromium/src/media/gpu/)
+  * [`//testing/buildbot/chromium.gpu.fyi.json`](https://cs.chromium.org/search?q=package:%5Echromium$+file:testing/buildbot/chromium.gpu.fyi.json)
+  * [`//testing/trigger_scripts/.+`](https://cs.chromium.org/chromium/src/testing/trigger_scripts/)
+  * [`//third_party/blink/renderer/modules/vr/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/vr/)
+  * [`//third_party/blink/renderer/modules/webgl/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgl/)
+  * [`//third_party/blink/renderer/modules/xr/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/xr/)
+  * [`//third_party/blink/renderer/platform/graphics/gpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/graphics/gpu/)
+  * [`//tools/clang/scripts/update.py`](https://cs.chromium.org/search?q=package:%5Echromium$+file:tools/clang/scripts/update.py)
+  * [`//ui/gl/.+`](https://cs.chromium.org/chromium/src/ui/gl/)
+
+
+## Experimental builders
+These builders are run on some percentage of builds. Their results are ignored
+by CQ. These are often used to test new configurations before they are added
+as required builders.
+
+* [fuchsia-compile-x64-dbg](https://ci.chromium.org/p/chromium/builders/try/fuchsia-compile-x64-dbg) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+fuchsia-compile-x64-dbg)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+fuchsia-compile-x64-dbg))
+  * Experiment percentage: 50
+
+* [fuchsia_arm64](https://ci.chromium.org/p/chromium/builders/try/fuchsia_arm64) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+fuchsia_arm64)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+fuchsia_arm64))
+  * Experiment percentage: 50
+
+* [ios-simulator-code-coverage](https://ci.chromium.org/p/chromium/builders/try/ios-simulator-code-coverage) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+ios-simulator-code-coverage)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+ios-simulator-code-coverage))
+  * Experiment percentage: 3
+
+* [linux-perfetto-rel](https://ci.chromium.org/p/chromium/builders/try/linux-perfetto-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-perfetto-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-perfetto-rel))
+  * Experiment percentage: 100
+
+  Path regular expressions:
+  * [`//base/trace_event/.+`](https://cs.chromium.org/chromium/src/base/trace_event/)
+  * [`//base/tracing/.+`](https://cs.chromium.org/chromium/src/base/tracing/)
+  * [`//components/tracing/.+`](https://cs.chromium.org/chromium/src/components/tracing/)
+  * [`//content/browser/tracing/.+`](https://cs.chromium.org/chromium/src/content/browser/tracing/)
+  * [`//services/tracing/.+`](https://cs.chromium.org/chromium/src/services/tracing/)
+
+* [mac-coverage-rel](https://ci.chromium.org/p/chromium/builders/try/mac-coverage-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+mac-coverage-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+mac-coverage-rel))
+  * Experiment percentage: 3
+
diff --git a/chromium/infra/config/generated/cr-buildbucket-dev.cfg b/chromium/infra/config/generated/cr-buildbucket-dev.cfg
new file mode 100644
index 00000000000..f22f95719c7
--- /dev/null
+++ b/chromium/infra/config/generated/cr-buildbucket-dev.cfg
@@ -0,0 +1,201 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see BuildbucketCfg message:
+#   https://luci-config.appspot.com/schemas/projects:buildbucket.cfg
+
+buckets {
+  name: "ci"
+  acls {
+    role: WRITER
+    group: "google/luci-task-force@google.com"
+  }
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "user:chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "user:luci-scheduler-dev@appspot.gserviceaccount.com"
+  }
+  swarming {
+    builders {
+      name: "android-lollipop-arm-rel-swarming"
+      swarming_host: "chromium-swarm-dev.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      recipe {
+        name: "swarming/staging"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.dev\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb-dev"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-marshmallow-arm64-rel-swarming"
+      swarming_host: "chromium-swarm-dev.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      recipe {
+        name: "swarming/staging"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.dev\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb-dev"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-rel-swarming"
+      swarming_host: "chromium-swarm-dev.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      recipe {
+        name: "swarming/staging"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.dev\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb-dev"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-rel-swarming-staging"
+      swarming_host: "chromium-swarm-staging.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      recipe {
+        name: "swarming/staging"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.dev\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb-dev"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-rel-swarming"
+      swarming_host: "chromium-swarm-dev.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      recipe {
+        name: "swarming/staging"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.dev\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb-dev"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-rel-swarming"
+      swarming_host: "chromium-swarm-dev.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      recipe {
+        name: "swarming/staging"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.dev\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb-dev"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-rel-swarming-staging"
+      swarming_host: "chromium-swarm-staging.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      recipe {
+        name: "swarming/staging"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.dev\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb-dev"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+  }
+}
diff --git a/chromium/infra/config/generated/cr-buildbucket.cfg b/chromium/infra/config/generated/cr-buildbucket.cfg
index e458774d37b..084c004bd3c 100644
--- a/chromium/infra/config/generated/cr-buildbucket.cfg
+++ b/chromium/infra/config/generated/cr-buildbucket.cfg
@@ -4,21 +4,765 @@
 # For the schema of this file, see BuildbucketCfg message:
 #   https://luci-config.appspot.com/schemas/projects:buildbucket.cfg
 
-buckets: <
+buckets {
   name: "ci"
-  acls: <
+  acls {
     role: WRITER
     group: "google/luci-task-force@google.com"
-  >
-  acls: <
+  }
+  acls {
     group: "all"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     group: "project-chromium-ci-schedulers"
-  >
-  swarming: <
-    builders: <
+  }
+  swarming {
+    builders {
+      name: "ASAN Debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ASAN Release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ASAN Release Media"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ASan Debug (32-bit x86 with V8-ARM)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ASan Release (32-bit x86 with V8-ARM)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ASan Release Media (32-bit x86 with V8-ARM)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Afl Upload Linux ASan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_afl"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android ASAN (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android CFI"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 16200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI 32 Vk Release (Pixel 2)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI 32 dEQP Vk Release (Pixel 2)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI 64 Perf (Pixel 2)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI 64 Vk Release (Pixel 2)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI 64 dEQP Vk Release (Pixel 2)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI Release (NVIDIA Shield TV)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI Release (Nexus 5)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI Release (Nexus 5X)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI Release (Nexus 6)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI Release (Nexus 6P)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI Release (Nexus 9)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI Release (Pixel 2)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI SkiaRenderer GL (Nexus 5X)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI SkiaRenderer Vulkan (Pixel 2)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android FYI dEQP Release (Nexus 5X)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Android Release (Nexus 5X)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -28,28 +772,91 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.gpu\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android WebLayer P FYI (rel)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android WebView L (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Android WebView M (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -59,28 +866,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Android WebView N (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -90,28 +898,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Android WebView O (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -121,28 +930,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Android WebView P (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -152,28 +962,91 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android WebView P Blink-CORS FYI (rel)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android WebView P FYI (rel)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Android arm Builder (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -183,28 +1056,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Android arm64 Builder (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -214,28 +1088,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Android x64 Builder (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -245,28 +1120,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Android x86 Builder (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -276,28 +1152,92 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "CFI Linux CF"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "CFI Linux ToT"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Cast Android (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -307,28 +1247,60 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Cast Audio Linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Cast Linux"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -338,28 +1310,246 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":50,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.linux\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ChromeOS FYI Release (amd64-generic)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ChromeOS FYI Release (kevin)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ChromiumOS ASAN Release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Closure Compilation Linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "closure_compilation"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "CrWinAsan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "CrWinAsan(dll)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Linux x64 Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Dawn Linux x64 DEPS Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -369,28 +1559,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Dawn Linux x64 DEPS Release (Intel HD 630)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -400,28 +1591,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Dawn Linux x64 DEPS Release (NVIDIA)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -431,28 +1623,120 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Linux x64 Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Linux x64 Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Mac x64 Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Dawn Mac x64 Builder"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Dawn Mac x64 DEPS Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -460,28 +1744,29 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.chromium.ci"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Dawn Mac x64 DEPS Release (AMD)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -491,28 +1776,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Dawn Mac x64 DEPS Release (Intel)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -522,28 +1808,153 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Mac x64 Release (AMD)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Mac x64 Release (Intel)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x64 ASAN Release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x64 Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Dawn Win10 x64 DEPS Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -553,28 +1964,29 @@ buckets: <
       dimensions: "os:Windows"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Dawn Win10 x64 DEPS Release (Intel HD 630)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -584,28 +1996,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Dawn Win10 x64 DEPS Release (NVIDIA)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -615,28 +2028,122 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x64 Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x64 Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x86 Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Dawn Win10 x86 DEPS Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -646,28 +2153,29 @@ buckets: <
       dimensions: "os:Windows"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Dawn Win10 x86 DEPS Release (Intel HD 630)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -677,28 +2185,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Dawn Win10 x86 DEPS Release (NVIDIA)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -708,28 +2217,246 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x86 Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x86 Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Deterministic Android"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "swarming/deterministic_build"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Deterministic Android (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "swarming/deterministic_build"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Deterministic Fuchsia (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "swarming/deterministic_build"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Deterministic Linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "swarming/deterministic_build"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Deterministic Linux (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "swarming/deterministic_build"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Fuchsia ARM64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -739,28 +2466,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.linux\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Fuchsia x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -770,28 +2498,553 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.linux\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Linux Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Linux Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Linux Ozone Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Linux dEQP Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Mac Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:GPU FYI Mac Builder"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Mac Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:GPU FYI Mac Builder (dbg)"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Mac dEQP Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:GPU FYI Mac dEQP Builder"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Perf Android 64 Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Win Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Win Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Win dEQP Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Win x64 Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Win x64 Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Win x64 DX12 Vulkan Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Win x64 DX12 Vulkan Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI Win x64 dEQP Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU FYI XR Win x64 Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "GPU Linux Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -801,28 +3054,60 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU Linux Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.gpu\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "GPU Mac Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -830,28 +3115,58 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.chromium.ci"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.gpu\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU Mac Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:GPU Mac Builder (dbg)"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "GPU Win x64 Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -861,28 +3176,491 @@ buckets: <
       dimensions: "os:Windows"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.gpu\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU Win x64 Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Leak Detection Linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Libfuzzer Upload Chrome OS ASan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_libfuzzer"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Libfuzzer Upload Linux ASan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_libfuzzer"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Libfuzzer Upload Linux ASan Debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_libfuzzer"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Libfuzzer Upload Linux MSan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_libfuzzer"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Libfuzzer Upload Linux UBSan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Libfuzzer Upload Linux UBSan"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium_libfuzzer"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Libfuzzer Upload Linux V8-ARM64 ASan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_libfuzzer"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Libfuzzer Upload Linux V8-ARM64 ASan Debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_libfuzzer"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Libfuzzer Upload Linux32 ASan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_libfuzzer"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Libfuzzer Upload Linux32 ASan Debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_libfuzzer"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Libfuzzer Upload Linux32 V8-ARM ASan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_libfuzzer"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Libfuzzer Upload Linux32 V8-ARM ASan Debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_libfuzzer"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Libfuzzer Upload Mac ASan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Libfuzzer Upload Mac ASan"
+      dimensions: "cores:24"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium_libfuzzer"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 14400
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Libfuzzer Upload Windows ASan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Libfuzzer Upload Windows ASan"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium_libfuzzer"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Linux ASan LSan Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -892,28 +3670,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:1"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.memory\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Linux ASan LSan Tests (1)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -923,28 +3702,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.memory\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Linux ASan Tests (sandboxed)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -954,28 +3734,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.memory\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Linux Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -985,28 +3766,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.linux\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Linux Builder (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1016,28 +3798,761 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.linux\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Builder (dbg)(32)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux CFI"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 14400
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Chromium OS ASan LSan Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Chromium OS ASan LSan Tests (1)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux ChromiumOS Full"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.chromiumos\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux ChromiumOS MSan Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux ChromiumOS MSan Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Debug (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux FYI Debug (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux FYI Experimental Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux FYI Experimental Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux FYI GPU TSAN Release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux FYI Ozone (Intel)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux FYI Release (AMD R7 240)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux FYI Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux FYI Release (Intel UHD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 64800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux FYI Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux FYI SkiaRenderer Dawn Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux FYI SkiaRenderer Vulkan (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux FYI SkiaRenderer Vulkan (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux FYI dEQP Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux FYI dEQP Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux MSan Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux MSan Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Linux Ozone Tester (Headless)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1047,28 +4562,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.linux\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Linux Ozone Tester (Wayland)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1078,28 +4594,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.linux\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Linux Ozone Tester (X11)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1109,28 +4626,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.linux\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Linux Release (NVIDIA)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1140,28 +4658,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.gpu\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Linux TSan Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1171,28 +4690,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.memory\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Linux TSan Tests"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1202,28 +4722,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.memory\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Linux Tests"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1233,28 +4754,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"jobs\":500}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.linux\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Linux Tests (dbg)(1)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1264,28 +4786,365 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.linux\""
-      >
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Viz"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux remote_run Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux remote_run Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Lollipop Phone Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Lollipop Tablet Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 72000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "MSAN Release (chained origins)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "MSAN Release (no origins)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac ASAN Release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac ASAN Release"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac ASAN Release Media"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac ASAN Release Media"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac ASan 64 Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac ASan 64 Builder"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"debug\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac ASan 64 Tests (1)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac ASan 64 Tests (1)"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Mac Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1293,28 +5152,29 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac-10.14"
       dimensions: "pool:luci.chromium.ci"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.mac\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Mac Builder (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1322,28 +5182,478 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.chromium.ci"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.mac\""
-      >
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac Builder Next"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac Builder Next"
+      dimensions: "cpu:x86-64"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac Debug (Intel)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac FYI Debug (Intel)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac FYI Experimental Release (Intel)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac FYI Experimental Retina Release (AMD)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac FYI Experimental Retina Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac FYI GPU ASAN Release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac FYI GPU ASAN Release"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac FYI Release (Intel)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac FYI Retina Debug (AMD)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac FYI Retina Debug (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac FYI Retina Release (AMD)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac FYI Retina Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac FYI dEQP Release AMD"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac FYI dEQP Release Intel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac Pro FYI Release (AMD)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Mac Release (Intel)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1353,28 +5663,60 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.gpu\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac Retina Debug (AMD)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Mac Retina Release (AMD)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1384,28 +5726,87 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.gpu\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac deterministic"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac deterministic"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "swarming/deterministic_build"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac deterministic (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac deterministic (dbg)"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "swarming/deterministic_build"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Mac10.10 Tests"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1415,27 +5816,28 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.mac\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Mac10.11 Tests"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1445,27 +5847,28 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.mac\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Mac10.12 Tests"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1475,27 +5878,28 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.mac\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Mac10.13 Tests"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1505,27 +5909,28 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.mac\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Mac10.13 Tests (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1535,27 +5940,28 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.mac\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Mac10.14 Tests"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1565,27 +5971,58 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.mac\""
-      >
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac10.15 Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Marshmallow 64 bit Tester"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1595,28 +6032,214 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Marshmallow Tablet Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mojo Android"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mojo ChromiumOS"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mojo Linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mojo Windows"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mojo Windows"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Network Service Linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Nougat Phone Tester"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1626,28 +6249,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Oreo Phone Tester"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1657,28 +6281,1127 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Site Isolation Android"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "TSAN Debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "TSAN Release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTAndroid"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTAndroid (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTAndroid x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTAndroid64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTAndroidASan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTAndroidCFI"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTAndroidOfficial"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTLinux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTLinux (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTLinuxASan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTLinuxASanLibfuzzer"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTLinuxCoverage"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_clang_coverage_tot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTLinuxMSan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTLinuxTSan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTLinuxThinLTO"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTLinuxUBSanVptr"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTMac"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:24"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.14"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+        properties_j: "xcode_build_version:\"11a1027\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTMac (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:24"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.14"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+        properties_j: "xcode_build_version:\"11a1027\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTMacASan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:24"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.14"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+        properties_j: "xcode_build_version:\"11a1027\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTMacCoverage"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:24"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.14"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_clang_coverage_tot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+        properties_j: "xcode_build_version:\"11a1027\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTWin(dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTWin(dll)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTWin64(dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTWin64(dll)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTWinASanLibfuzzer"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTWinCFI"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTWinCFI64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTiOS"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.14"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+        properties_j: "xcode_build_version:\"11c29\""
+      }
+      execution_timeout_secs: 43200
+      caches {
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ToTiOSDevice"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.14"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+        properties_j: "xcode_build_version:\"11c29\""
+      }
+      execution_timeout_secs: 43200
+      caches {
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "UBSan Release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "UBSan vptr Release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "UBSanVptr Linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "VR Linux"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1688,28 +7411,122 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.fyi\""
-      >
+      }
       execution_timeout_secs: 36000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "WebKit Linux ASAN"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "WebKit Linux Leak"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "WebKit Linux MSAN"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "WebKit Mac10.13 (retina)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1719,27 +7536,88 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.mac\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "WebKit Win10"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:WebKit Win10"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win 10 Fast Ring"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win 10 Fast Ring"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Win 7 Tests x64 (1)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1748,28 +7626,119 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows-7"
       dimensions: "pool:luci.chromium.ci"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.win\""
-      >
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win ASan Release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win ASan Release"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win ASan Release Media"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win ASan Release Media"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fuzz\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win Builder"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Win Builder (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1778,28 +7747,29 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.chromium.ci"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.win\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Win x64 Builder"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1808,28 +7778,541 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.chromium.ci"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.win\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win x64 Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 DX12 Vulkan Debug (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 DX12 Vulkan Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 Debug (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 Exp Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 Exp Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 Release (AMD RX 550)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 Release (Intel UHD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 64800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 64800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 Release XR Perf (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 SkiaRenderer Dawn Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 SkiaRenderer GL (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 dEQP Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x64 dEQP Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 FYI x86 Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Win10 Tests x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1838,28 +8321,59 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.chromium.ci"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.win\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 Tests x64 (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win10 Tests x64 (dbg)"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Win10 Tests x64 1803"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1868,27 +8382,59 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.chromium.ci"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.fyi\""
-      >
+      }
       execution_timeout_secs: 36000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 x64 Debug (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Win10 x64 Release (NVIDIA)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1898,28 +8444,269 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.gpu\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win7 (32) Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win7 (32) Tests"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-7"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win7 FYI Debug (AMD)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win7 FYI Release (AMD)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win7 FYI Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win7 FYI dEQP Release (AMD)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win7 FYI x64 Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win7 FYI x64 dEQP Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu.fyi\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win7 Tests (1)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win7 Tests (1)"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-7"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "Win7 Tests (dbg)(1)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1928,28 +8715,370 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows-7"
       dimensions: "pool:luci.chromium.ci"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.win\""
-      >
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Windows deterministic"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Windows deterministic"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "swarming/deterministic_build"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-10-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-archive-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-archive-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-arm64-proguard-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-asan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-avd-packager"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "android/avd_packager"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "avd_configs:[\"tools/android/avd/proto/creation/generic_android23.textpb\",\"tools/android/avd/proto/creation/generic_android28.textpb\",\"tools/android/avd/proto/creation/generic_playstore_android28.textpb\"]"
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-cipd-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-bfcache-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-binary-size-generator"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "binary_size_generator_tot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-code-coverage"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_java_coverage\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 72000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-code-coverage-native"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 72000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android-cronet-arm-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1959,28 +9088,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android-cronet-arm-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1990,28 +9120,122 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-arm64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-asan-arm-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android-cronet-kitkat-arm-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2021,28 +9245,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android-cronet-lollipop-arm-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2052,28 +9277,181 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-marshmallow-arm64-perf-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:android-cronet-marshmallow-arm64-perf-rel"
+      dimensions: "os:Android"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "cronet"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-marshmallow-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-x86-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-x86-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-incremental-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android-lollipop-arm-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2083,28 +9461,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android-marshmallow-arm64-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2114,28 +9493,187 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-marshmallow-x86-fyi-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-marshmallow-x86-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-mojo-webview-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-nougat-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-official"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android-pie-arm64-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2145,28 +9683,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android-pie-arm64-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2176,28 +9715,214 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-pie-x86-fyi-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android.fyi\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-pie-x86-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.android\""
-      >
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-sdk-packager"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "android/sdk_packager"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "packages:[{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/25.0.2.yaml\",\"sdk_package_name\":\"build-tools;25.0.2\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/27.0.3.yaml\",\"sdk_package_name\":\"build-tools;27.0.3\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/29.0.2.yaml\",\"sdk_package_name\":\"build-tools;29.0.2\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/cmdline-tools.yaml\",\"sdk_package_name\":\"cmdline-tools;latest\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/emulator.yaml\",\"sdk_package_name\":\"emulator\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/extras/google/gcm.yaml\",\"sdk_package_name\":\"extras;google;gcm\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/patcher/v4.yaml\",\"sdk_package_name\":\"patcher;v4\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platforms/android-23.yaml\",\"sdk_package_name\":\"platforms;android-23\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platforms/android-28.yaml\",\"sdk_package_name\":\"platforms;android-28\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platforms/android-29.yaml\",\"sdk_package_name\":\"platforms;android-29\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platform-tools.yaml\",\"sdk_package_name\":\"platform-tools\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/sources/android-28.yaml\",\"sdk_package_name\":\"sources;android-28\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/sources/android-29.yaml\",\"sdk_package_name\":\"sources;android-29\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-23/google_apis/x86.yaml\",\"sdk_package_name\":\"system-images;android-23;google_apis;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-28/google_apis_playstore/x86.yaml\",\"sdk_package_name\":\"system-images;android-28;google_apis_playstore;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-29/google_apis/x86.yaml\",\"sdk_package_name\":\"system-images;android-29;google_apis;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-29/google_apis_playstore/x86.yaml\",\"sdk_package_name\":\"system-images;android-29;google_apis_playstore;x86\"}]"
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-cipd-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-weblayer-pie-x86-fyi-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android.fyi\""
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-asan-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.chromiumos\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-cfi-thin-lto-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.chromiumos\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "chromeos-amd64-generic-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2207,28 +9932,61 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.chromiumos\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-lacros-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/archive:{\"archive_datas\":[{\"archive_type\":\"ARCHIVE_TYPE_ZIP\",\"dirs\":[\"locales\",\"swiftshader\"],\"files\":[\"chrome\",\"chrome_100_percent.pak\",\"chrome_200_percent.pak\",\"crashpad_handler\",\"headless_lib.pak\",\"icudtl.dat\",\"nacl_helper\",\"nacl_irt_x86_64.nexe\",\"resources.pak\",\"snapshot_blob.bin\"],\"gcs_bucket\":\"chromium-lacros-fishfood\",\"gcs_path\":\"x86_64/{%position%}/lacros.zip\"}]}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "chromeos-amd64-generic-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2238,28 +9996,60 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.chromiumos\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-arm-generic-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.chromiumos\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "chromeos-arm-generic-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2269,28 +10059,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.chromiumos\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "chromeos-kevin-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2300,29 +10091,3724 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.chromiumos\""
-      >
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-arm64-cast"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-fyi-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-fyi-x64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-fyi-x64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-official"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-x64-cast"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-x64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-asan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-asan"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-device"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-device"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 10800
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 10800
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-code-coverage"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-code-coverage"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"coverage_exclude_sources\":\"ios_test_files_and_test_utils\",\"coverage_test_types\":[\"overall\",\"unit\"],\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 72000
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-cr-recipe"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-cr-recipe"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+        properties_j: "xcode_build_version:\"11a1027\""
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-cronet"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-cronet"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-full-configs"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-full-configs"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 10800
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-multi-window"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-multi-window"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-noncq"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-noncq"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 10800
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-webkit-tot"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-webkit-tot"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+        properties_j: "xcode_build_version:\"11e608cwk\""
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_11e608cwk"
+        path: "xcode_ios_11e608cwk.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios13-beta-simulator"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios13-beta-simulator"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios13-sdk-device"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios13-sdk-device"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+        properties_j: "xcode_build_version:\"11n700h\""
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_11n700h"
+        path: "xcode_ios_11n700h.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios13-sdk-simulator"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios13-sdk-simulator"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+        properties_j: "xcode_build_version:\"11n700h\""
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_11n700h"
+        path: "xcode_ios_11n700h.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios14-beta-simulator"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios14-beta-simulator"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios14-sdk-simulator"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios14-sdk-simulator"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+        properties_j: "xcode_build_version:\"12a6159\""
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_12a6159"
+        path: "xcode_ios_12a6159.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-annotator-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-archive-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-archive-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-bfcache-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-blink-animation-use-time-delta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-blink-cors-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-blink-heap-concurrent-marking-tsan-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-blink-heap-verification"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-chromeos-code-coverage"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 72000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-chromeos-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.chromiumos\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-chromeos-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.chromiumos\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-chromium-tests-staging-builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-chromium-tests-staging-tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-code-coverage"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 72000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-fieldtrial-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-gcc-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":500}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-official"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium\""
+      }
+      execution_timeout_secs: 21600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-ozone-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-perfetto-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-swangle-chromium-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-swangle-tot-angle-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-swangle-tot-angle-x86"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-swangle-tot-swiftshader-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-swangle-tot-swiftshader-x86"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-swangle-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-swangle-x86"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-trusty-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-14.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-upload-perfetto"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-win_cross-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.clang\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
+      }
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-wpt-fyi-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experimental: YES
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_component_updater"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "findit/chromium/update_components"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "component-mapping-updater@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-archive-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-archive-dbg"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-archive-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-archive-rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-arm64"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-code-coverage"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:24"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 72000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-hermetic-upgrade-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-hermetic-upgrade-rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-mojo-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-mojo-rel"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-osxbeta-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-swangle-chromium-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-swangle-chromium-x64"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-upload-perfetto"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-annotator-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 57600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-archive-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-archive-dbg"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-archive-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-archive-rel"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-asan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-celab-builder-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-celab-builder-rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "celab"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "exclude:\"chrome_only\""
+        properties_j: "mastername:\"chromium.fyi\""
+        properties_j: "pool_name:\"celab-chromium-ci\""
+        properties_j: "pool_size:20"
+        properties_j: "tests:\"*\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-celab-tester-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-celab-tester-rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "celab"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "exclude:\"chrome_only\""
+        properties_j: "mastername:\"chromium.fyi\""
+        properties_j: "pool_name:\"celab-chromium-ci\""
+        properties_j: "pool_size:20"
+        properties_j: "tests:\"*\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-pixel-builder-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-pixel-builder-rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-pixel-tester-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-pixel-tester-rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-swangle-chromium-x86"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-swangle-tot-angle-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-swangle-tot-angle-x86"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-swangle-tot-swiftshader-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-swangle-tot-swiftshader-x86"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-swangle-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-swangle-x86"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.swangle\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-upload-perfetto"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win10-code-coverage"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 72000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win32-archive-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win32-archive-dbg"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win32-archive-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win32-archive-rel"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win32-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win32-arm64-rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+  }
+}
+buckets {
+  name: "ci-m83"
+  acls {
+    role: WRITER
+    group: "google/luci-task-force@google.com"
+  }
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-chromium-ci-schedulers"
+  }
+  swarming {
+    builders {
+      name: "Android Release (Nexus 5X)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android WebView M (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android WebView N (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android WebView O (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android WebView P (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android arm Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android arm64 Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android x64 Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android x86 Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Cast Android (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Cast Linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":50,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Linux x64 DEPS Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Linux x64 DEPS Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Linux x64 DEPS Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Mac x64 DEPS Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Dawn Mac x64 DEPS Builder"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Mac x64 DEPS Release (AMD)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Mac x64 DEPS Release (Intel)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x64 DEPS Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x64 DEPS Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x64 DEPS Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x86 DEPS Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x86 DEPS Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x86 DEPS Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Fuchsia ARM64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Fuchsia x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU Linux Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU Mac Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:GPU Mac Builder"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU Win x64 Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux ASan LSan Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux ASan LSan Tests (1)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux ASan Tests (sandboxed)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Ozone Tester (Headless)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
-      name: "chromeos-kevin-rel-hw-tests"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Ozone Tester (Wayland)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
@@ -2331,28 +13817,1259 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Ozone Tester (X11)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux TSan Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux TSan Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"jobs\":500}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Tests (dbg)(1)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac Builder"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.14"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac Builder (dbg)"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac Release (Intel)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac Retina Release (AMD)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac10.10 Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac10.11 Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac10.12 Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac10.13 Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac10.13 Tests (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac10.14 Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Marshmallow 64 bit Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Nougat Phone Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Oreo Phone Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "VR Linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.fyi\""
-      >
+      }
       execution_timeout_secs: 36000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "WebKit Mac10.13 (retina)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win 7 Tests x64 (1)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win 7 Tests x64 (1)"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-7"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win Builder (dbg)"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win x64 Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win x64 Builder"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 Tests x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win10 Tests x64"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 Tests x64 1803"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win10 Tests x64 1803"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 x64 Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win7 Tests (dbg)(1)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win7 Tests (dbg)(1)"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-7"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-arm-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-arm-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-kitkat-arm-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-lollipop-arm-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-lollipop-arm-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-marshmallow-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-pie-arm64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-pie-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.chromiumos\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.chromiumos\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-arm-generic-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.chromiumos\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "fuchsia-arm64-cast"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2362,28 +15079,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.linux\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "fuchsia-x64-cast"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2393,28 +15111,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.linux\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "ios-simulator"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2422,33 +15141,34 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
-      recipe: <
-        name: "chromium"
+      recipe {
+        name: "ios/unified_builder_tester"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.mac\""
-        properties_j: "xcode_build_version:\"11c29\""
-      >
+        properties_j: "xcode_build_version:\"11e146\""
+      }
       execution_timeout_secs: 10800
-      caches: <
-        name: "xcode_ios_11c29"
-        path: "xcode_ios_11c29.app"
-      >
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "ios-simulator-cronet"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2456,33 +15176,34 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.fyi\""
         properties_j: "xcode_build_version:\"11c29\""
-      >
+      }
       execution_timeout_secs: 36000
-      caches: <
-        name: "xcode_ios_11c29"
-        path: "xcode_ios_11c29.app"
-      >
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "ios-simulator-full-configs"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2490,33 +15211,2692 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
-      recipe: <
+      recipe {
+        name: "ios/unified_builder_tester"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 10800
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-chromeos-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.chromiumos\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-chromeos-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.chromiumos\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-ozone-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-osxbeta-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+  }
+}
+buckets {
+  name: "ci-m84"
+  acls {
+    role: WRITER
+    group: "google/luci-task-force@google.com"
+  }
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-chromium-ci-schedulers"
+  }
+  swarming {
+    builders {
+      name: "Android Release (Nexus 5X)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android WebView M (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android WebView N (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android WebView O (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android WebView P (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android arm Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android arm64 Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android x64 Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android x86 Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Cast Android (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Cast Linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":50,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Linux x64 DEPS Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Linux x64 DEPS Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Linux x64 DEPS Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Mac x64 DEPS Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Dawn Mac x64 DEPS Builder"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Mac x64 DEPS Release (AMD)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Mac x64 DEPS Release (Intel)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x64 DEPS Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x64 DEPS Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x64 DEPS Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x86 DEPS Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x86 DEPS Release (Intel HD 630)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Dawn Win10 x86 DEPS Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.dawn\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Fuchsia ARM64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Fuchsia x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU Linux Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU Mac Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:GPU Mac Builder"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "GPU Win x64 Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux ASan LSan Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux ASan LSan Tests (1)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux ASan Tests (sandboxed)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Ozone Tester (Headless)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Ozone Tester (Wayland)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Ozone Tester (X11)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux TSan Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux TSan Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.memory\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"jobs\":500}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux Tests (dbg)(1)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac Builder"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.14"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac Builder (dbg)"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac Release (Intel)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac Retina Release (AMD)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac10.10 Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac10.11 Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac10.12 Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac10.13 Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac10.13 Tests (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac10.14 Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Marshmallow 64 bit Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Nougat Phone Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Oreo Phone Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "VR Linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "WebKit Mac10.13 (retina)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win 7 Tests x64 (1)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win 7 Tests x64 (1)"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-7"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win Builder (dbg)"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win x64 Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win x64 Builder"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 Tests x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win10 Tests x64"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 Tests x64 1803"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win10 Tests x64 1803"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win10 x64 Release (NVIDIA)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.gpu\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Win7 Tests (dbg)(1)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win7 Tests (dbg)(1)"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-7"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.win\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-arm-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-arm-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-kitkat-arm-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-lollipop-arm-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-lollipop-arm-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-marshmallow-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-pie-arm64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-pie-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.chromiumos\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.chromiumos\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-arm-generic-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.chromiumos\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-arm64-cast"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-x64-cast"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 10800
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-cronet"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-cronet"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.fyi\""
         properties_j: "xcode_build_version:\"11c29\""
-      >
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-full-configs"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-full-configs"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
       execution_timeout_secs: 10800
-      caches: <
-        name: "xcode_ios_11c29"
-        path: "xcode_ios_11c29.app"
-      >
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux-chromeos-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2526,28 +17906,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.chromiumos\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux-chromeos-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2557,28 +17938,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.chromiumos\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux-ozone-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2588,28 +17970,29 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.linux\""
-      >
+      }
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "mac-osxbeta-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2619,59 +18002,2040 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.fyi\""
-      >
+      }
       execution_timeout_secs: 36000
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb: <
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "ci_test_results"
-          test_results: <>
-        >
-      >
-    >
-  >
->
-buckets: <
+          test_results {}
+        }
+      }
+    }
+  }
+}
+buckets {
+  name: "findit"
+  acls {
+    identity: "user:findit-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acls {
+    group: "googlers"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "user:luci-scheduler@appspot.gserviceaccount.com"
+  }
+  acls {
+    role: SCHEDULER
+    group: "findit-tryjob-access"
+  }
+  swarming {
+    builders {
+      name: "findit-rerun"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "pool:luci.chromium.findit"
+      dimensions: "ssd:1"
+      recipe {
+        name: "findit/chromium/single_revision"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+      }
+      execution_timeout_secs: 28800
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "findit-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "findit_variable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "pool:luci.chromium.findit"
+      dimensions: "ssd:1"
+      recipe {
+        name: "findit/chromium/compile"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+      }
+      execution_timeout_secs: 28800
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "findit-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "linux_chromium_bot_db_exporter"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.findit"
+      dimensions: "ssd:1"
+      recipe {
+        name: "findit/chromium/export_bot_db"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "gs_bucket:\"findit-for-me\""
+        properties_j: "gs_object:\"bot_db.json\""
+      }
+      execution_timeout_secs: 28800
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "findit-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+  }
+}
+buckets {
+  name: "goma"
+  acls {
+    role: WRITER
+    group: "google/luci-task-force@google.com"
+  }
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-chromium-ci-schedulers"
+  }
+  swarming {
+    builders {
+      name: "Chromium Android ARM 32-bit Goma RBE Staging"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Android ARM 32-bit Goma RBE Staging"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Android ARM 32-bit Goma RBE ToT"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Android ARM 32-bit Goma RBE ToT"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?tot\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Android ARM 32-bit Goma RBE ToT (ATS)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Android ARM 32-bit Goma RBE ToT (ATS)"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?tot\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Linux Goma RBE Staging"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Linux Goma RBE Staging"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Linux Goma RBE Staging (clobber)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Linux Goma RBE Staging (clobber)"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Linux Goma RBE Staging (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Linux Goma RBE Staging (dbg)"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Linux Goma RBE Staging (dbg) (clobber)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Linux Goma RBE Staging (dbg) (clobber)"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Linux Goma RBE ToT"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Linux Goma RBE ToT"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?tot\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Linux Goma RBE ToT (ATS)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Linux Goma RBE ToT (ATS)"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?tot\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Linux Goma Staging"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Linux Goma Staging"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Mac Goma RBE Staging"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Mac Goma RBE Staging"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":80,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Mac Goma RBE Staging (clobber)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Mac Goma RBE Staging (clobber)"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":80,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Mac Goma RBE Staging (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Mac Goma RBE Staging (dbg)"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":80,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Mac Goma RBE ToT"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Mac Goma RBE ToT"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":80,\"rpc_extra_params\":\"?tot\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Mac Goma Staging"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Mac Goma Staging"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":80}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Win Goma RBE Staging"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Win Goma RBE Staging"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Win Goma RBE Staging (clobber)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Win Goma RBE Staging (clobber)"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium Win Goma RBE ToT"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium Win Goma RBE ToT"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?tot\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Chromium iOS Goma RBE ToT"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Chromium iOS Goma RBE ToT"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.14"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":80,\"rpc_extra_params\":\"?tot\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+        properties_j: "xcode_build_version:\"11c29\""
+      }
+      execution_timeout_secs: 10800
+      caches {
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "CrWinGomaStaging"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:CrWinGomaStaging"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Linux Builder Goma Canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-14.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Linux Builder Goma Latest Client"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Linux Builder Goma RBE Canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Linux Builder Goma RBE Latest Client"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Mac Builder (dbg) Goma Canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac Builder (dbg) Goma Canary"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Mac Builder (dbg) Goma Canary (clobber)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac Builder (dbg) Goma Canary (clobber)"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Mac Builder (dbg) Goma Latest Client"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac Builder (dbg) Goma Latest Client"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Mac Builder (dbg) Goma Latest Client (clobber)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac Builder (dbg) Goma Latest Client (clobber)"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Mac Builder (dbg) Goma RBE Canary (clobber)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac Builder (dbg) Goma RBE Canary (clobber)"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":80,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Mac Builder (dbg) Goma RBE Latest Client (clobber)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac Builder (dbg) Goma RBE Latest Client (clobber)"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":80,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Mac Builder Goma Canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac Builder Goma Canary"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Mac Builder Goma Latest Client"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac Builder Goma Latest Client"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Win Builder (dbg) Goma Canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win Builder (dbg) Goma Canary"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Win Builder (dbg) Goma Latest Client"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win Builder (dbg) Goma Latest Client"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Win Builder (dbg) Goma RBE Latest Client"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win Builder (dbg) Goma RBE Latest Client"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Win Builder Goma Canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win Builder Goma Canary"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Win Builder Goma Latest Client"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win Builder Goma Latest Client"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Win Builder Goma RBE Latest Client"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win Builder Goma RBE Latest Client"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?staging\",\"server_host\":\"staging-goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Win7 Builder (dbg) Goma Canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win7 Builder (dbg) Goma Canary"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-7"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Win7 Builder (dbg) Goma Latest Client"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win7 Builder (dbg) Goma Latest Client"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-7"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Win7 Builder Goma Canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win7 Builder Goma Canary"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-7"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "Win7 Builder Goma Latest Client"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Win7 Builder Goma Latest Client"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-7"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "android-archive-dbg-goma-canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "android-archive-dbg-goma-latest"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "android-archive-dbg-goma-rbe-ats-canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "android-archive-dbg-goma-rbe-ats-latest"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "android-archive-dbg-goma-rbe-canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "android-archive-dbg-goma-rbe-latest"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-rel-goma-canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-rel-goma-latest"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-rel-goma-rbe-canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-rel-goma-rbe-latest"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "ios-device-goma-canary-clobber"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-device-goma-canary-clobber"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+        properties_j: "xcode_build_version:\"11c29\""
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "ios-device-goma-latest-clobber"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-device-goma-latest-clobber"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+        properties_j: "xcode_build_version:\"11c29\""
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "ios-device-goma-rbe-canary-clobber"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-device-goma-rbe-canary-clobber"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+        properties_j: "xcode_build_version:\"11c29\""
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "ios-device-goma-rbe-latest-clobber"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-device-goma-rbe-latest-clobber"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+        properties_j: "xcode_build_version:\"11c29\""
+      }
+      execution_timeout_secs: 36000
+      caches {
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "linux-archive-rel-goma-canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "linux-archive-rel-goma-canary-localoutputcache"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "linux-archive-rel-goma-latest"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "linux-archive-rel-goma-latest-localoutputcache"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "linux-archive-rel-goma-rbe-ats-canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "linux-archive-rel-goma-rbe-ats-latest"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "linux-archive-rel-goma-rbe-canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "linux-archive-rel-goma-rbe-latest"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "mac-archive-rel-goma-canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-archive-rel-goma-canary"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "mac-archive-rel-goma-canary-localoutputcache"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-archive-rel-goma-canary-localoutputcache"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "mac-archive-rel-goma-latest"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-archive-rel-goma-latest"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "mac-archive-rel-goma-latest-localoutputcache"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-archive-rel-goma-latest-localoutputcache"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "mac-archive-rel-goma-rbe-canary"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-archive-rel-goma-rbe-canary"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":80,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "mac-archive-rel-goma-rbe-latest"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-archive-rel-goma-rbe-latest"
+      dimensions: "cores:4"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":80,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "win32-archive-rel-goma-canary-localoutputcache"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win32-archive-rel-goma-canary-localoutputcache"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "win32-archive-rel-goma-latest-localoutputcache"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win32-archive-rel-goma-latest-localoutputcache"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.goma.fyi\""
+      }
+      execution_timeout_secs: 36000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+  }
+}
+buckets {
   name: "try"
-  acls: <
+  acls {
     role: WRITER
     group: "service-account-chromium-tryserver"
-  >
-  acls: <
+  }
+  acls {
     group: "all"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     identity: "user:findit-for-me@appspot.gserviceaccount.com"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     identity: "user:tricium-prod@appspot.gserviceaccount.com"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     group: "project-chromium-tryjob-access"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     group: "service-account-chromeperf"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     group: "service-account-cq"
-  >
-  swarming: <
-    builders: <
+  }
+  acls {
+    role: SCHEDULER
+    identity: "project:angle"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "project:dawn"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "project:skia"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "project:v8"
+  }
+  swarming {
+    builders {
+      name: "android-10-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-asan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-bfcache-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android-binary-size"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2681,37 +20045,37 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "binary_size_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/binary_size:{\"analyze_targets\":[\"//android_webview:system_webview_apk_manifest_expectations\",\"//android_webview:trichrome_webview_apk_manifest_expectations\",\"//chrome/android:chrome_modern_public_bundle__base_libs_and_assets_expectations\",\"//chrome/android:monochrome_public_bundle__base_bundle_module_manifest_expectations\",\"//chrome/android:monochrome_public_bundle__base_libs_and_assets_expectations\",\"//chrome/android:monochrome_public_bundle_proguard_expectations\",\"//chrome/android:monochrome_public_minimal_apks\",\"//chrome/android:trichrome_chrome_bundle__base_bundle_module_manifest_expectations\",\"//chrome/android:trichrome_chrome_bundle__base_libs_and_assets_expectations\",\"//chrome/android:trichrome_library_apk_libs_and_assets_expectations\",\"//chrome/android:trichrome_library_apk_manifest_expectations\",\"//tools/binary_size:binary_size_trybot_py\"],\"compile_targets\":[\"chrome_modern_public_bundle__base_libs_and_assets_expectations\",\"monochrome_public_bundle__base_bundle_module_manifest_expectations\",\"monochrome_public_bundle__base_libs_and_assets_expectations\",\"monochrome_public_bundle_proguard_expectations\",\"monochrome_public_minimal_apks\",\"monochrome_static_initializers\",\"system_webview_apk_manifest_expectations\",\"trichrome_chrome_bundle__base_bundle_module_manifest_expectations\",\"trichrome_chrome_bundle__base_libs_and_assets_expectations\",\"trichrome_library_apk_libs_and_assets_expectations\",\"trichrome_library_apk_manifest_expectations\",\"trichrome_webview_apk_manifest_expectations\"]}"
+        properties_j: "$build/binary_size:{\"analyze_targets\":[\"//chrome/android:validate_expectations\",\"//chrome/android:monochrome_public_minimal_apks\",\"//tools/binary_size:binary_size_trybot_py\"],\"compile_targets\":[\"monochrome_public_minimal_apks\",\"monochrome_static_initializers\",\"validate_expectations\"]}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.android\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android-cronet-arm-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2721,36 +20085,114 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.android\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-deterministic-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "swarming/deterministic_build"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-deterministic-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "swarming/deterministic_build"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android-lollipop-arm-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2760,36 +20202,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.android\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android-marshmallow-arm64-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2799,7 +20241,7 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
@@ -2807,30 +20249,147 @@ buckets: <
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.android\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
-      name: "android-pie-arm64-dbg"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-marshmallow-x86-fyi-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-marshmallow-x86-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-nougat-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-official"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
@@ -2839,36 +20398,232 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-opus-arm-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.android\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-oreo-arm64-cts-networkservice-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-oreo-arm64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-pie-arm64-coverage-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:16"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-pie-arm64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android-pie-arm64-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2878,36 +20633,771 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.android\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-pie-x86-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-weblayer-pie-arm64-fyi-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-weblayer-pie-x86-fyi-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-webview-marshmallow-arm64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-webview-nougat-arm64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-webview-oreo-arm64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-webview-pie-arm64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-webview-pie-arm64-fyi-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_angle_deqp_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:android_angle_deqp_rel_ng"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_angle_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:android_angle_rel_ng"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_angle_vk32_deqp_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:android_angle_vk32_deqp_rel_ng"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_angle_vk32_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:android_angle_vk32_rel_ng"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_angle_vk64_deqp_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:android_angle_vk64_deqp_rel_ng"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_angle_vk64_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:android_angle_vk64_rel_ng"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_archive_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_arm64_dbg_recipe"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_blink_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_cfi_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_clang_dbg_recipe"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android_compile_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2917,36 +21407,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.android\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android_compile_x64_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2956,36 +21446,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.android\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android_compile_x86_dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2995,36 +21485,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.android\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android_cronet"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3034,36 +21524,114 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_mojo"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.android\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_n5x_swarming_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "android_optional_gpu_tests_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3072,36 +21640,75 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.android\""
-      >
+      }
       execution_timeout_secs: 21600
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_unswarmed_pixel_aosp"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "cast_shell_android"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3111,36 +21718,75 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.android\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "cast_shell_audio_linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "cast_shell_linux"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3150,36 +21796,75 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-cfi-thin-lto-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "chromeos-amd64-generic-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3189,36 +21874,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.chromiumos\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "chromeos-amd64-generic-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3228,36 +21913,75 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-arm-generic-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.chromiumos\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "chromeos-arm-generic-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3267,36 +21991,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.chromiumos\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "chromeos-kevin-compile-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3306,36 +22030,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.chromiumos\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "chromeos-kevin-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3345,36 +22069,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.chromiumos\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "chromium_presubmit"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3384,7 +22108,7 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "presubmit"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
@@ -3392,29 +22116,29 @@ buckets: <
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
         properties_j: "repo_name:\"chromium\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "closure_compilation"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3424,36 +22148,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "closure_compilation"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "dawn-linux-x64-deps-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3461,36 +22185,36 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "dawn-mac-x64-deps-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3498,36 +22222,110 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.chromium.try"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.dawn\""
-      >
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "dawn-try-win10-x64-asan-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:dawn-try-win10-x64-asan-rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.dawn\""
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "dawn-try-win10-x86-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:dawn-try-win10-x86-rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.dawn\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "dawn-win10-x64-deps-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3535,36 +22333,36 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.chromium.try"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "dawn-win10-x86-deps-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3572,36 +22370,74 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.chromium.try"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.dawn\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-angle-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:fuchsia-angle-rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "fuchsia-arm64-cast"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3611,36 +22447,231 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-compile-x64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-fyi-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-fyi-x64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-fyi-x64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-official"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "fuchsia-x64-cast"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3650,36 +22681,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "fuchsia_arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3689,36 +22720,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "fuchsia_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3728,36 +22759,2495 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-android-l-nexus-5-32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.nexus5.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-android-l-nexus-6-32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.nexus6.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-android-m-nexus-5x-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.nexus5x.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-android-m-nexus-5x-deqp-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.nexus5x.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-android-m-nexus-5x-skgl-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.nexus5x.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-android-m-nexus-6p-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.nexus6p.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-android-m-nexus-9-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.nexus9.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-android-n-nvidia-shield-tv-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.nvidia.shield.tv.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-android-p-pixel-2-32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.pixel2.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-android-p-pixel-2-skv-32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.pixel2.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-android-q-pixel-2-deqp-vk-32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.pixel2.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-android-q-pixel-2-deqp-vk-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.pixel2.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-android-q-pixel-2-vk-32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.pixel2.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-android-q-pixel-2-vk-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.pixel2.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-chromeos-amd64-generic"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.chromeos.amd64.generic.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-chromeos-kevin"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.chromeos.kevin.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-linux-intel-dqp"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.linux.intel.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-linux-intel-exp"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.linux.intel.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-linux-intel-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.linux.intel.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-linux-intel-sk-dawn-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.linux.intel.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-linux-intel-skv"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.linux.intel.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-linux-nvidia-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.linux.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-linux-nvidia-dqp"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.linux.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-linux-nvidia-exp"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.linux.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-linux-nvidia-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.linux.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-linux-nvidia-skv"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.linux.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-linux-nvidia-tsn"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.linux.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-mac-amd-dqp"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.retina.amd.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-mac-amd-pro-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.pro.amd.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-mac-amd-retina-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.retina.amd.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-mac-amd-retina-exp"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.retina.amd.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-mac-amd-retina-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.retina.amd.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-mac-asan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.retina.amd.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-mac-intel-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.mini.intel.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-mac-intel-dqp"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.mini.intel.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-mac-intel-exp"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.mini.intel.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-mac-intel-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.mini.intel.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-mac-nvidia-retina-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.retina.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-mac-nvidia-retina-exp"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.retina.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 43200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-mac-nvidia-retina-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.retina.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win10-intel-dqp-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win10.intel.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win10-intel-exp-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win10.intel.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win10-intel-rel-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win10.intel.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win10-nvidia-dbg-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win10.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win10-nvidia-dqp-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win10.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win10-nvidia-dx12vk-dbg-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win10.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win10-nvidia-dx12vk-rel-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win10.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win10-nvidia-exp-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win10.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win10-nvidia-rel-32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win10.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win10-nvidia-rel-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win10.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win10-nvidia-sk-dawn-rel-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win10.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win10-nvidia-skgl-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win10.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win7-amd-dbg-32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win7.amd.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win7-amd-dqp-32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win7.amd.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win7-amd-rel-32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win7.amd.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win7-nvidia-dqp-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win7.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win7-nvidia-rel-32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win7.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-fyi-try-win7-nvidia-rel-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win7.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-try-android-m-nexus-5x-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.android.nexus5x.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-try-linux-nvidia-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.linux.nvidia.try"
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-try-linux-nvidia-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.linux.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-try-mac-amd-retina-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.retina.amd.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-try-mac-intel-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.mini.intel.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gpu-try-win10-nvidia-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.gpu.win10.nvidia.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-device"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-device"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "ios-simulator"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3765,41 +25255,126 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.try"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.mac\""
-        properties_j: "xcode_build_version:\"11c29\""
-      >
+        properties_j: "xcode_build_version:\"11e146\""
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
-      caches: <
-        name: "xcode_ios_11c29"
-        path: "xcode_ios_11c29.app"
-      >
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-code-coverage"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-code-coverage"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"coverage_exclude_sources\":\"ios_test_files_and_test_utils\",\"coverage_test_types\":[\"unit\"],\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-cr-recipe"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-cr-recipe"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "ios-simulator-cronet"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3807,41 +25382,83 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.try"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.mac\""
-        properties_j: "xcode_build_version:\"11c29\""
-      >
+        properties_j: "xcode_build_version:\"11e146\""
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
-      caches: <
-        name: "xcode_ios_11c29"
-        path: "xcode_ios_11c29.app"
-      >
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-eg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-eg"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "ios/try"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "ios-simulator-full-configs"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3849,41 +25466,8101 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.try"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.mac\""
-        properties_j: "xcode_build_version:\"11c29\""
-      >
+        properties_j: "xcode_build_version:\"11e146\""
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
-      caches: <
-        name: "xcode_ios_11c29"
-        path: "xcode_ios_11c29.app"
-      >
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-multi-window"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-multi-window"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-noncq"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-noncq"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "ios/try"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios13-beta-simulator"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios13-beta-simulator"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11e608c\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11e608c"
+        path: "xcode_ios_11e608c.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios13-sdk-simulator"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios13-sdk-simulator"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11n700h\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11n700h"
+        path: "xcode_ios_11n700h.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios14-beta-simulator"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios14-beta-simulator"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios14-sdk-simulator"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios14-sdk-simulator"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11n700h\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11n700h"
+        path: "xcode_ios_11n700h.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "layout_test_leak_detection"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "leak_detection_linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-angle-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:linux-angle-rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-annotator-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-autofill-assistant"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-bfcache-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-blink-heap-concurrent-marking-tsan-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-blink-heap-verification-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-blink-optional-highdpi-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.blink\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.blink\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-chromeos-compile-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-chromeos-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-chromeos-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-clang-tidy-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "tricium_clang_tidy_wrapper"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-clang-tidy-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "tricium_clang_tidy_wrapper"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-dawn-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:linux-dawn-rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.dawn\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-dcheck-off-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-gcc-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-layout-tests-edit-ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-layout-tests-fragment-item"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-libfuzzer-asan-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_libfuzzer_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-official"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-ozone-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-perfetto-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-swangle-chromium-try-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.swangle.chromium.linux.x64.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-swangle-try-tot-angle-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.swangle.angle.linux.x64.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 7200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-swangle-try-tot-angle-x86"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.swangle.linux.x86.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 7200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-swangle-try-tot-swiftshader-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.swangle.sws.linux.x64.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 7200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-swangle-try-tot-swiftshader-x86"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.swangle.linux.x86.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 7200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-swangle-try-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.swangle.deps.linux.x64.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 7200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-swangle-try-x86"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.swangle.linux.x86.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 7200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-trusty-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-14.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-viz-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-webkit-msan-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-wpt-fyi-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_android_dbg_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_angle_deqp_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:linux_angle_deqp_rel_ng"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_angle_ozone_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:linux_angle_ozone_rel_ng"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_analysis"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_archive_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_asan_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_cfi_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_chromeos_asan_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_chromeos_msan_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_clobber_deterministic"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "swarming/deterministic_build"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_clobber_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_compile_dbg_32_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_compile_dbg_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "builder"
+        path: "linux_debug"
+      }
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_compile_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_dbg_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "builder"
+        path: "linux_debug"
+      }
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_msan_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_tsan_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_ubsan_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_layout_tests_composite_after_paint"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_layout_tests_layout_ng_disabled"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_mojo"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_mojo_chromeos"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_optional_gpu_tests_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:linux_optional_gpu_tests_rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_upload_clang"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-14.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_upload_clang"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_vr"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-angle-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-angle-rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-coverage-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-dawn-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac-dawn-rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.dawn\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-osxbeta-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-swangle-chromium-try-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.swangle.chromium.mac.x64.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac10.10-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.blink\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac10.11-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.blink\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac10.12-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.blink\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac10.13-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.blink\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac10.13_retina-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.blink\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac10.14-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.blink\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac10.15-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.blink\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_chromium_10.10"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_chromium_10.12_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_chromium_10.13_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_chromium_10.14_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_chromium_10.15_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_chromium_archive_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_chromium_asan_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_chromium_compile_dbg_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_chromium_compile_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_chromium_dbg_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_optional_gpu_tests_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac_optional_gpu_tests_rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_upload_clang"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac_upload_clang"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_upload_clang"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9a235\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_mac_9a235"
+        path: "xcode_mac_9a235.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "network_service_linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "tricium-metrics-analysis"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "tricium_metrics"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "try-nougat-phone-tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-angle-deqp-rel-32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-angle-deqp-rel-32"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-angle-deqp-rel-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-angle-deqp-rel-64"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-angle-rel-32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-angle-rel-32"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-angle-rel-64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-angle-rel-64"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.angle\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-annotator-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-asan"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-celab-try-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "celab"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "exclude:\"chrome_only\""
+        properties_j: "mastername:\"tryserver.chromium.win\""
+        properties_j: "pool_name:\"celab-chromium-try\""
+        properties_j: "pool_size:20"
+        properties_j: "tests:\"*\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-dawn-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-dawn-rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.dawn\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-libfuzzer-asan-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-libfuzzer-asan-rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_libfuzzer_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-swangle-chromium-try-x86"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.swangle.chromium.win.x86.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-swangle-try-tot-angle-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.swangle.win.x64.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 7200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-swangle-try-tot-angle-x86"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.swangle.angle.win.x86.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 7200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-swangle-try-tot-swiftshader-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.swangle.win.x64.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 7200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-swangle-try-tot-swiftshader-x86"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.swangle.sws.win.x86.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 7200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-swangle-try-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.swangle.win.x64.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 7200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-swangle-try-x86"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.swangle.deps.win.x86.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.swangle\""
+      }
+      execution_timeout_secs: 7200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win10-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.blink\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win10_chromium_x64_dbg_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win10_chromium_x64_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win10_chromium_x64_rel_ng_exp"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win10_chromium_x64_rel_ng_exp"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win7-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.blink\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win7-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 16200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win_archive"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win_chromium_compile_dbg_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win_chromium_compile_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win_chromium_dbg_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win_chromium_x64_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win_mojo"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win_optional_gpu_tests_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win_upload_clang"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win_upload_clang"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_upload_clang"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win_x64_archive"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+  }
+}
+buckets {
+  name: "try-m83"
+  acls {
+    role: WRITER
+    group: "service-account-chromium-tryserver"
+  }
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "user:findit-for-me@appspot.gserviceaccount.com"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "user:tricium-prod@appspot.gserviceaccount.com"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-chromium-tryjob-access"
+  }
+  acls {
+    role: SCHEDULER
+    group: "service-account-chromeperf"
+  }
+  acls {
+    role: SCHEDULER
+    group: "service-account-cq"
+  }
+  swarming {
+    builders {
+      name: "android-binary-size"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "binary_size_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-arm-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-lollipop-arm-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-marshmallow-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:16"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_java_coverage\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-pie-arm64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-pie-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:16"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_compile_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_compile_x64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_compile_x86_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_cronet"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_optional_gpu_tests_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:android_optional_gpu_tests_rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "cast_shell_android"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "cast_shell_linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-arm-generic-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromium_presubmit"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "presubmit"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/presubmit:{\"runhooks\":true,\"timeout_s\":480}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+        properties_j: "repo_name:\"chromium\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "closure_compilation"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "closure_compilation"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "dawn-linux-x64-deps-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:dawn-linux-x64-deps-rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.dawn\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "dawn-mac-x64-deps-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:dawn-mac-x64-deps-rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.dawn\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "dawn-win10-x64-deps-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:dawn-win10-x64-deps-rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.dawn\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "dawn-win10-x86-deps-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:dawn-win10-x86-deps-rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.dawn\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-arm64-cast"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-x64-cast"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia_arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia_x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "ios/try"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-cronet"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-cronet"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-full-configs"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-full-configs"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "ios/try"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.blink\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-chromeos-compile-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-chromeos-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-libfuzzer-asan-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_libfuzzer_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-ozone-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_asan_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_compile_dbg_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "builder"
+        path: "linux_debug"
+      }
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_dbg_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "builder"
+        path: "linux_debug"
+      }
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_chromium_tsan_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_layout_tests_composite_after_paint"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_layout_tests_layout_ng_disabled"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_optional_gpu_tests_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:linux_optional_gpu_tests_rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "linux_vr"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_chromium_compile_dbg_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.13"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "mac_optional_gpu_tests_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:mac_optional_gpu_tests_rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win-libfuzzer-asan-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-libfuzzer-asan-rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_libfuzzer_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win10_chromium_x64_rel_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win_chromium_compile_dbg_ng"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win_optional_gpu_tests_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.win\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+  }
+}
+buckets {
+  name: "try-m84"
+  acls {
+    role: WRITER
+    group: "service-account-chromium-tryserver"
+  }
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "user:findit-for-me@appspot.gserviceaccount.com"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "user:tricium-prod@appspot.gserviceaccount.com"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-chromium-tryjob-access"
+  }
+  acls {
+    role: SCHEDULER
+    group: "service-account-chromeperf"
+  }
+  acls {
+    role: SCHEDULER
+    group: "service-account-cq"
+  }
+  swarming {
+    builders {
+      name: "android-binary-size"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "binary_size_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/binary_size:{\"analyze_targets\":[\"//android_webview:system_webview_apk_manifest_expectations\",\"//android_webview:trichrome_webview_apk_manifest_expectations\",\"//chrome/android:chrome_modern_public_bundle__base_libs_and_assets_expectations\",\"//chrome/android:monochrome_public_bundle__base_bundle_module_manifest_expectations\",\"//chrome/android:monochrome_public_bundle__base_libs_and_assets_expectations\",\"//chrome/android:monochrome_public_bundle_proguard_expectations\",\"//chrome/android:monochrome_public_minimal_apks\",\"//chrome/android:trichrome_chrome_bundle__base_bundle_module_manifest_expectations\",\"//chrome/android:trichrome_chrome_bundle__base_libs_and_assets_expectations\",\"//chrome/android:trichrome_library_apk_libs_and_assets_expectations\",\"//chrome/android:trichrome_library_apk_manifest_expectations\",\"//tools/binary_size:binary_size_trybot_py\"],\"compile_targets\":[\"chrome_modern_public_bundle__base_libs_and_assets_expectations\",\"monochrome_public_bundle__base_bundle_module_manifest_expectations\",\"monochrome_public_bundle__base_libs_and_assets_expectations\",\"monochrome_public_bundle_proguard_expectations\",\"monochrome_public_minimal_apks\",\"monochrome_static_initializers\",\"system_webview_apk_manifest_expectations\",\"trichrome_chrome_bundle__base_bundle_module_manifest_expectations\",\"trichrome_chrome_bundle__base_libs_and_assets_expectations\",\"trichrome_library_apk_libs_and_assets_expectations\",\"trichrome_library_apk_manifest_expectations\",\"trichrome_webview_apk_manifest_expectations\"]}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-cronet-arm-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-lollipop-arm-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-marshmallow-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:16"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/code_coverage:{\"use_java_coverage\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-pie-arm64-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android-pie-arm64-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:16"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":300,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_compile_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_compile_x64_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_compile_x86_dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_cronet"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "android_optional_gpu_tests_rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:android_optional_gpu_tests_rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 21600
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "cast_shell_android"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "cast_shell_linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-amd64-generic-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromeos-arm-generic-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "chromium_presubmit"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "presubmit"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/presubmit:{\"runhooks\":true,\"timeout_s\":480}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+        properties_j: "repo_name:\"chromium\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "closure_compilation"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "closure_compilation"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "dawn-linux-x64-deps-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:dawn-linux-x64-deps-rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.dawn\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "dawn-mac-x64-deps-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:dawn-mac-x64-deps-rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.dawn\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "dawn-win10-x64-deps-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:dawn-win10-x64-deps-rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.dawn\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "dawn-win10-x86-deps-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:dawn-win10-x86-deps-rel"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.dawn\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-arm64-cast"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia-x64-cast"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia_arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "fuchsia_x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-cronet"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-cronet"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "ios-simulator-full-configs"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-full-configs"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.15"
+      dimensions: "pool:luci.chromium.try"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.mac\""
+        properties_j: "xcode_build_version:\"11e146\""
+      }
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux-blink-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3893,36 +33570,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.blink\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux-chromeos-compile-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3932,36 +33609,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.chromiumos\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux-chromeos-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3971,7 +33648,7 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
@@ -3979,29 +33656,29 @@ buckets: <
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.chromiumos\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux-libfuzzer-asan-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4011,36 +33688,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_libfuzzer_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux-ozone-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4050,36 +33727,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4089,7 +33766,7 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
@@ -4097,29 +33774,29 @@ buckets: <
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux_chromium_asan_rel_ng"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4129,36 +33806,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux_chromium_compile_dbg_ng"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4168,40 +33845,40 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "builder"
         path: "linux_debug"
-      >
-      caches: <
+      }
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux_chromium_dbg_ng"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4211,40 +33888,40 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "builder"
         path: "linux_debug"
-      >
-      caches: <
+      }
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux_chromium_tsan_rel_ng"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4254,36 +33931,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux_layout_tests_composite_after_paint"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4293,36 +33970,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux_layout_tests_layout_ng_disabled"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4332,36 +34009,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux_optional_gpu_tests_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4370,36 +34047,36 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 21600
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "linux_vr"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4409,36 +34086,36 @@ buckets: <
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.linux\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "mac-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4447,36 +34124,36 @@ buckets: <
       dimensions: "os:Mac-10.13"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.mac\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "mac_chromium_compile_dbg_ng"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4485,36 +34162,36 @@ buckets: <
       dimensions: "os:Mac-10.13"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.mac\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "mac_optional_gpu_tests_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4522,36 +34199,36 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       dimensions: "pool:luci.chromium.try"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.mac\""
-      >
+      }
       execution_timeout_secs: 21600
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "win-libfuzzer-asan-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4560,36 +34237,36 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
       dimensions: "pool:luci.chromium.try"
-      recipe: <
+      recipe {
         name: "chromium_libfuzzer_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.win\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "win10_chromium_x64_rel_ng"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4599,7 +34276,7 @@ buckets: <
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
@@ -4607,29 +34284,29 @@ buckets: <
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.win\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "win_chromium_compile_dbg_ng"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4639,36 +34316,36 @@ buckets: <
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.win\""
-      >
+      }
       execution_timeout_secs: 14400
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-    builders: <
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "win_optional_gpu_tests_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4678,34 +34355,677 @@ buckets: <
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:0"
-      recipe: <
+      recipe {
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.win\""
-      >
+      }
       execution_timeout_secs: 21600
       expiration_secs: 7200
-      caches: <
+      caches {
         name: "win_toolchain"
         path: "win_toolchain"
-      >
+      }
       build_numbers: YES
       service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage: <
+      task_template_canary_percentage {
         value: 5
-      >
-      resultdb: <
+      }
+      resultdb {
         enable: true
-        bq_exports: <
+        bq_exports {
           project: "luci-resultdb"
           dataset: "chromium"
           table: "try_test_results"
-          test_results: <>
-        >
-      >
-    >
-  >
->
+          test_results {}
+        }
+      }
+    }
+  }
+}
+buckets {
+  name: "webrtc"
+  acls {
+    role: WRITER
+    group: "google/luci-task-force@google.com"
+  }
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-chromium-ci-schedulers"
+  }
+  swarming {
+    builders {
+      name: "WebRTC Chromium Android Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:WebRTC Chromium Android Builder"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumWebRTC\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium Android Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:WebRTC Chromium Android Tester"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.webrtc\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumWebRTC\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium Linux Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:WebRTC Chromium Linux Builder"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumWebRTC\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium Linux Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:WebRTC Chromium Linux Tester"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.webrtc\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumWebRTC\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium Mac Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:WebRTC Chromium Mac Builder"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumWebRTC\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium Mac Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:WebRTC Chromium Mac Tester"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.webrtc\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumWebRTC\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium Win Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:WebRTC Chromium Win Builder"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumWebRTC\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium Win10 Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:WebRTC Chromium Win10 Tester"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.webrtc\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumWebRTC\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium Win7 Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:WebRTC Chromium Win7 Tester"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.webrtc\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumWebRTC\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium Win8 Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:WebRTC Chromium Win8 Tester"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.webrtc\""
+        properties_j: "perf_dashboard_machine_group:\"ChromiumWebRTC\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+  }
+}
+buckets {
+  name: "webrtc.fyi"
+  acls {
+    role: WRITER
+    group: "google/luci-task-force@google.com"
+  }
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-chromium-ci-schedulers"
+  }
+  swarming {
+    builders {
+      name: "WebRTC Chromium FYI Android Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Android Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Android Builder ARM64 (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Android Tests (dbg) (L Nexus5)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Android Tests (dbg) (M Nexus5X)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Linux Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Linux Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Linux Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Mac Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+        properties_j: "xcode_build_version:\"11c29\""
+      }
+      execution_timeout_secs: 7200
+      caches {
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Mac Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+        properties_j: "xcode_build_version:\"11c29\""
+      }
+      execution_timeout_secs: 7200
+      caches {
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Mac Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+        properties_j: "xcode_build_version:\"11c29\""
+      }
+      execution_timeout_secs: 7200
+      caches {
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Win Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Win Builder (dbg)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Win10 Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Win7 Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-7"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI Win8 Tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-8.1"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI ios-device"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "webrtc/chromium_ios"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      caches {
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
+      name: "WebRTC Chromium FYI ios-simulator"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.webrtc.fyi"
+      recipe {
+        name: "webrtc/chromium_ios"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "mastername:\"chromium.webrtc.fyi\""
+      }
+      execution_timeout_secs: 7200
+      caches {
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+      }
+    }
+  }
+}
diff --git a/chromium/infra/config/generated/luci-logdog-dev.cfg b/chromium/infra/config/generated/luci-logdog-dev.cfg
new file mode 100644
index 00000000000..d95b2d69bb9
--- /dev/null
+++ b/chromium/infra/config/generated/luci-logdog-dev.cfg
@@ -0,0 +1,9 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectConfig message:
+#   https://luci-config.appspot.com/schemas/projects:luci-logdog.cfg
+
+reader_auth_groups: "all"
+writer_auth_groups: "luci-logdog-chromium-dev-writers"
+archive_gs_bucket: "chromium-luci-logdog"
diff --git a/chromium/infra/config/generated/luci-milo-dev.cfg b/chromium/infra/config/generated/luci-milo-dev.cfg
new file mode 100644
index 00000000000..958fb369df3
--- /dev/null
+++ b/chromium/infra/config/generated/luci-milo-dev.cfg
@@ -0,0 +1,236 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see Project message:
+#   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
+
+consoles {
+  id: "chromium.dev"
+  name: "chromium.dev"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-lollipop-arm-rel-swarming"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-marshmallow-arm64-rel-swarming"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-rel-swarming"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-rel-swarming"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-rel-swarming"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "swarm dev"
+        url: "/p/chromium/g/chromium.dev"
+        alt: "Chromium Swarm Dev console"
+      }
+      links {
+        text: "prod"
+        url: "https://luci-milo.appspot.com/p/chromium/g/main/console"
+        alt: "Main luci-milo console"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo-dev.cfg"
+        alt: "Customize this console"
+      }
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "chromium.staging"
+  name: "chromium.staging"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-rel-swarming-staging"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-rel-swarming-staging"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "swarm dev"
+        url: "/p/chromium/g/chromium.dev"
+        alt: "Chromium Swarm Dev console"
+      }
+      links {
+        text: "prod"
+        url: "https://luci-milo.appspot.com/p/chromium/g/main/console"
+        alt: "Main luci-milo console"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo-dev.cfg"
+        alt: "Customize this console"
+      }
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/chromium.svg"
diff --git a/chromium/infra/config/generated/luci-milo.cfg b/chromium/infra/config/generated/luci-milo.cfg
index 1094cabcf16..3fb22406a64 100644
--- a/chromium/infra/config/generated/luci-milo.cfg
+++ b/chromium/infra/config/generated/luci-milo.cfg
@@ -4,356 +4,6251 @@
 # For the schema of this file, see Project message:
 #   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
 
-consoles: <
+consoles {
+  id: "main"
+  name: "Chromium Main Console"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-archive-dbg"
+    category: "chromium|android"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-archive-rel"
+    category: "chromium|android"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-archive-dbg"
+    category: "chromium|linux"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-archive-rel"
+    category: "chromium|linux"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-archive-dbg"
+    category: "chromium|mac"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-archive-rel"
+    category: "chromium|mac"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win32-archive-dbg"
+    category: "chromium|win|dbg"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-archive-dbg"
+    category: "chromium|win|dbg"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win32-archive-rel"
+    category: "chromium|win|rel"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-archive-rel"
+    category: "chromium|win|rel"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win Builder"
+    category: "chromium.win|release|builder"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win x64 Builder"
+    category: "chromium.win|release|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win7 (32) Tests"
+    category: "chromium.win|release|tester"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win7 Tests (1)"
+    category: "chromium.win|release|tester"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win 7 Tests x64 (1)"
+    category: "chromium.win|release|tester"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 Tests x64"
+    category: "chromium.win|release|tester"
+    short_name: "w10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win x64 Builder (dbg)"
+    category: "chromium.win|debug|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win Builder (dbg)"
+    category: "chromium.win|debug|builder"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win7 Tests (dbg)(1)"
+    category: "chromium.win|debug|tester"
+    short_name: "7"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 Tests x64 (dbg)"
+    category: "chromium.win|debug|tester"
+    short_name: "10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Windows deterministic"
+    category: "chromium.win|misc"
+    short_name: "det"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/WebKit Win10"
+    category: "chromium.win|misc"
+    short_name: "wbk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac Builder"
+    category: "chromium.mac|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
+    category: "chromium.mac|release"
+    short_name: "10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
+    category: "chromium.mac|release"
+    short_name: "11"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.12 Tests"
+    category: "chromium.mac|release"
+    short_name: "12"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.13 Tests"
+    category: "chromium.mac|release"
+    short_name: "13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.14 Tests"
+    category: "chromium.mac|release"
+    short_name: "14"
+  }
+  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"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.13 Tests (dbg)"
+    category: "chromium.mac|debug"
+    short_name: "13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-device"
+    category: "chromium.mac|ios|default"
+    short_name: "dev"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator"
+    category: "chromium.mac|ios|default"
+    short_name: "sim"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-full-configs"
+    category: "chromium.mac|ios|default"
+    short_name: "ful"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-noncq"
+    category: "chromium.mac|ios|default"
+    short_name: "non"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Builder"
+    category: "chromium.linux|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Tests"
+    category: "chromium.linux|release"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Network Service Linux"
+    category: "chromium.linux|release"
+    short_name: "nsl"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-gcc-rel"
+    category: "chromium.linux|release"
+    short_name: "gcc"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-blink-cors-rel"
+    category: "chromium.linux|release"
+    short_name: "crs"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux"
+    category: "chromium.linux|release"
+    short_name: "det"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-ozone-rel"
+    category: "chromium.linux|release"
+    short_name: "ozo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-trusty-rel"
+    category: "chromium.linux|release"
+    short_name: "tru"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)(32)"
+    category: "chromium.linux|debug|builder"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)"
+    category: "chromium.linux|debug|builder"
+    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)"
+    category: "chromium.linux|debug|tester"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Cast Linux"
+    category: "chromium.linux|cast"
+    short_name: "vid"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Cast Audio Linux"
+    category: "chromium.linux|cast"
+    short_name: "aud"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Fuchsia ARM64"
+    category: "chromium.linux|fuchsia|a64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-arm64-cast"
+    category: "chromium.linux|fuchsia|cast"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-x64-cast"
+    category: "chromium.linux|fuchsia|cast"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-x64-dbg"
+    category: "chromium.linux|fuchsia|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Fuchsia (dbg)"
+    category: "chromium.linux|fuchsia|x64"
+    short_name: "det"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Fuchsia x64"
+    category: "chromium.linux|fuchsia|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS Full"
+    category: "chromium.chromiumos|default"
+    short_name: "ful"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-chromeos-rel"
+    category: "chromium.chromiumos|default"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-chromeos-dbg"
+    category: "chromium.chromiumos|default"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-arm-generic-rel"
+    category: "chromium.chromiumos|simple|release"
+    short_name: "arm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-kevin-rel"
+    category: "chromium.chromiumos|simple|release"
+    short_name: "kvn"
+  }
+  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|x64"
+    short_name: "cfi"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel"
+    category: "chromium.chromiumos|simple|release|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-arm-generic-dbg"
+    category: "chromium.chromiumos|simple|debug"
+    short_name: "arm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-dbg"
+    category: "chromium.chromiumos|simple|debug|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chrome.ci/linux-chromeos-chrome"
+    category: "chrome"
+    short_name: "cro"
+  }
+  builders {
+    name: "buildbucket/luci.chrome.ci/linux-chrome"
+    category: "chrome"
+    short_name: "lnx"
+  }
+  builders {
+    name: "buildbucket/luci.chrome.ci/mac-chrome"
+    category: "chrome"
+    short_name: "mac"
+  }
+  builders {
+    name: "buildbucket/luci.chrome.ci/win-chrome"
+    category: "chrome"
+    short_name: "win"
+  }
+  builders {
+    name: "buildbucket/luci.chrome.ci/win64-chrome"
+    category: "chrome"
+    short_name: "win"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-asan"
+    category: "chromium.memory|win"
+    short_name: "asn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac ASan 64 Builder"
+    category: "chromium.memory|mac"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac ASan 64 Tests (1)"
+    category: "chromium.memory|mac"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux TSan Builder"
+    category: "chromium.memory|linux|TSan v2"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux TSan Tests"
+    category: "chromium.memory|linux|TSan v2"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Builder"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Tests (1)"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ASan Tests (sandboxed)"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "sbx"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux MSan Builder"
+    category: "chromium.memory|linux|msan"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux MSan Tests"
+    category: "chromium.memory|linux|msan"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/WebKit Linux ASAN"
+    category: "chromium.memory|linux|webkit"
+    short_name: "asn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/WebKit Linux MSAN"
+    category: "chromium.memory|linux|webkit"
+    short_name: "msn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/WebKit Linux Leak"
+    category: "chromium.memory|linux|webkit"
+    short_name: "lk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Chromium OS ASan LSan Builder"
+    category: "chromium.memory|cros|asan"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Chromium OS ASan LSan Tests (1)"
+    category: "chromium.memory|cros|asan"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS MSan Builder"
+    category: "chromium.memory|cros|msan"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS MSan Tests"
+    category: "chromium.memory|cros|msan"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-asan"
+    category: "chromium.memory|android"
+    short_name: "asn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux CFI"
+    category: "chromium.memory|cfi"
+    short_name: "lnx"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "main-m83"
+  name: "Chromium M83 Console"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/branch-heads/4103"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Win x64 Builder"
+    category: "chromium.win|release|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Win 7 Tests x64 (1)"
+    category: "chromium.win|release|tester"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Win10 Tests x64"
+    category: "chromium.win|release|tester"
+    short_name: "w10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Win Builder (dbg)"
+    category: "chromium.win|debug|builder"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Win7 Tests (dbg)(1)"
+    category: "chromium.win|debug|tester"
+    short_name: "7"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac Builder"
+    category: "chromium.mac|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac10.10 Tests"
+    category: "chromium.mac|release"
+    short_name: "10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac10.11 Tests"
+    category: "chromium.mac|release"
+    short_name: "11"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac10.12 Tests"
+    category: "chromium.mac|release"
+    short_name: "12"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac10.13 Tests"
+    category: "chromium.mac|release"
+    short_name: "13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac10.14 Tests"
+    category: "chromium.mac|release"
+    short_name: "14"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/WebKit Mac10.13 (retina)"
+    category: "chromium.mac|release"
+    short_name: "ret"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac Builder (dbg)"
+    category: "chromium.mac|debug"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac10.13 Tests (dbg)"
+    category: "chromium.mac|debug"
+    short_name: "13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/ios-simulator"
+    category: "chromium.mac|ios|default"
+    short_name: "sim"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/ios-simulator-full-configs"
+    category: "chromium.mac|ios|default"
+    short_name: "ful"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Builder"
+    category: "chromium.linux|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Tests"
+    category: "chromium.linux|release"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/linux-ozone-rel"
+    category: "chromium.linux|release"
+    short_name: "ozo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Builder (dbg)"
+    category: "chromium.linux|debug|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Tests (dbg)(1)"
+    category: "chromium.linux|debug|tester"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Cast Linux"
+    category: "chromium.linux|cast"
+    short_name: "vid"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Fuchsia ARM64"
+    category: "chromium.linux|fuchsia|a64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/fuchsia-arm64-cast"
+    category: "chromium.linux|fuchsia|cast"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/fuchsia-x64-cast"
+    category: "chromium.linux|fuchsia|cast"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Fuchsia x64"
+    category: "chromium.linux|fuchsia|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/linux-chromeos-rel"
+    category: "chromium.chromiumos|default"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/linux-chromeos-dbg"
+    category: "chromium.chromiumos|default"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/chromeos-arm-generic-rel"
+    category: "chromium.chromiumos|simple|release"
+    short_name: "arm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/chromeos-amd64-generic-rel"
+    category: "chromium.chromiumos|simple|release|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/chromeos-amd64-generic-dbg"
+    category: "chromium.chromiumos|simple|debug|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-cronet-arm-dbg"
+    category: "chromium.android|cronet|arm"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-cronet-arm-rel"
+    category: "chromium.android|cronet|arm"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-cronet-kitkat-arm-rel"
+    category: "chromium.android|cronet|test"
+    short_name: "k"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-cronet-lollipop-arm-rel"
+    category: "chromium.android|cronet|test"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android arm Builder (dbg)"
+    category: "chromium.android|builder|arm"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android arm64 Builder (dbg)"
+    category: "chromium.android|builder|arm"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android x86 Builder (dbg)"
+    category: "chromium.android|builder|x86"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android x64 Builder (dbg)"
+    category: "chromium.android|builder|x86"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Marshmallow 64 bit Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Nougat Phone Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "N"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Oreo Phone Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "O"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-pie-arm64-dbg"
+    category: "chromium.android|tester|phone"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android WebView M (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android WebView N (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "N"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android WebView O (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "O"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android WebView P (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-lollipop-arm-rel"
+    category: "chromium.android|on_cq"
+    short_name: "L"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-marshmallow-arm64-rel"
+    category: "chromium.android|on_cq"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-pie-arm64-rel"
+    category: "chromium.android|on_cq"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Cast Android (dbg)"
+    category: "chromium.android|on_cq"
+    short_name: "cst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux TSan Builder"
+    category: "chromium.memory|linux|TSan v2"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux TSan Tests"
+    category: "chromium.memory|linux|TSan v2"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux ASan LSan Builder"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux ASan LSan Tests (1)"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux ASan Tests (sandboxed)"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "sbx"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Linux x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Linux|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Linux x64 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Linux|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Linux x64 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Linux|Nvidia"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Mac x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Mac|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Mac x64 DEPS Release (AMD)"
+    category: "chromium.dawn|DEPS|Mac|AMD"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Mac x64 DEPS Release (Intel)"
+    category: "chromium.dawn|DEPS|Mac|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Win10 x86 DEPS Builder"
+    category: "chromium.dawn|DEPS|Windows|Builder"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Win10 x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Windows|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Win10 x86 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Windows|Intel"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Win10 x64 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Windows|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Win10 x86 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Windows|Nvidia"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Win10 x64 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Windows|Nvidia"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/GPU Win x64 Builder"
+    category: "chromium.gpu|Windows"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Win10 x64 Release (NVIDIA)"
+    category: "chromium.gpu|Windows"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/GPU Mac Builder"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac Release (Intel)"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac Retina Release (AMD)"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/GPU Linux Builder"
+    category: "chromium.gpu|Linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Release (NVIDIA)"
+    category: "chromium.gpu|Linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android Release (Nexus 5X)"
+    category: "chromium.gpu|Android"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/ios-simulator-cronet"
+    category: "chromium.fyi|cronet"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/mac-osxbeta-rel"
+    category: "chromium.fyi|mac"
+    short_name: "beta"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/VR Linux"
+    category: "chromium.fyi|linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Ozone Tester (Headless)"
+    category: "chromium.fyi|linux"
+    short_name: "loh"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Ozone Tester (Wayland)"
+    category: "chromium.fyi|linux"
+    short_name: "low"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Ozone Tester (X11)"
+    category: "chromium.fyi|linux"
+    short_name: "lox"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Win10 Tests x64 1803"
+    category: "chromium.fyi|win10|1803"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "main-m84"
+  name: "Chromium M84 Console"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/branch-heads/4147"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Win x64 Builder"
+    category: "chromium.win|release|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Win 7 Tests x64 (1)"
+    category: "chromium.win|release|tester"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Win10 Tests x64"
+    category: "chromium.win|release|tester"
+    short_name: "w10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Win Builder (dbg)"
+    category: "chromium.win|debug|builder"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Win7 Tests (dbg)(1)"
+    category: "chromium.win|debug|tester"
+    short_name: "7"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac Builder"
+    category: "chromium.mac|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac10.10 Tests"
+    category: "chromium.mac|release"
+    short_name: "10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac10.11 Tests"
+    category: "chromium.mac|release"
+    short_name: "11"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac10.12 Tests"
+    category: "chromium.mac|release"
+    short_name: "12"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac10.13 Tests"
+    category: "chromium.mac|release"
+    short_name: "13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac10.14 Tests"
+    category: "chromium.mac|release"
+    short_name: "14"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/WebKit Mac10.13 (retina)"
+    category: "chromium.mac|release"
+    short_name: "ret"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac Builder (dbg)"
+    category: "chromium.mac|debug"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac10.13 Tests (dbg)"
+    category: "chromium.mac|debug"
+    short_name: "13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/ios-simulator"
+    category: "chromium.mac|ios|default"
+    short_name: "sim"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/ios-simulator-full-configs"
+    category: "chromium.mac|ios|default"
+    short_name: "ful"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Builder"
+    category: "chromium.linux|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Tests"
+    category: "chromium.linux|release"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/linux-ozone-rel"
+    category: "chromium.linux|release"
+    short_name: "ozo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Builder (dbg)"
+    category: "chromium.linux|debug|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Tests (dbg)(1)"
+    category: "chromium.linux|debug|tester"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Cast Linux"
+    category: "chromium.linux|cast"
+    short_name: "vid"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Fuchsia ARM64"
+    category: "chromium.linux|fuchsia|a64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/fuchsia-arm64-cast"
+    category: "chromium.linux|fuchsia|cast"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/fuchsia-x64-cast"
+    category: "chromium.linux|fuchsia|cast"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Fuchsia x64"
+    category: "chromium.linux|fuchsia|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/linux-chromeos-rel"
+    category: "chromium.chromiumos|default"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/linux-chromeos-dbg"
+    category: "chromium.chromiumos|default"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/chromeos-arm-generic-rel"
+    category: "chromium.chromiumos|simple|release"
+    short_name: "arm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/chromeos-amd64-generic-rel"
+    category: "chromium.chromiumos|simple|release|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/chromeos-amd64-generic-dbg"
+    category: "chromium.chromiumos|simple|debug|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-cronet-arm-dbg"
+    category: "chromium.android|cronet|arm"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-cronet-arm-rel"
+    category: "chromium.android|cronet|arm"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-cronet-kitkat-arm-rel"
+    category: "chromium.android|cronet|test"
+    short_name: "k"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-cronet-lollipop-arm-rel"
+    category: "chromium.android|cronet|test"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android arm Builder (dbg)"
+    category: "chromium.android|builder|arm"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android arm64 Builder (dbg)"
+    category: "chromium.android|builder|arm"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android x86 Builder (dbg)"
+    category: "chromium.android|builder|x86"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android x64 Builder (dbg)"
+    category: "chromium.android|builder|x86"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Marshmallow 64 bit Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Nougat Phone Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "N"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Oreo Phone Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "O"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-pie-arm64-dbg"
+    category: "chromium.android|tester|phone"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android WebView M (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android WebView N (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "N"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android WebView O (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "O"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android WebView P (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-lollipop-arm-rel"
+    category: "chromium.android|on_cq"
+    short_name: "L"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-marshmallow-arm64-rel"
+    category: "chromium.android|on_cq"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-pie-arm64-rel"
+    category: "chromium.android|on_cq"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Cast Android (dbg)"
+    category: "chromium.android|on_cq"
+    short_name: "cst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux TSan Builder"
+    category: "chromium.memory|linux|TSan v2"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux TSan Tests"
+    category: "chromium.memory|linux|TSan v2"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux ASan LSan Builder"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux ASan LSan Tests (1)"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux ASan Tests (sandboxed)"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "sbx"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Linux x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Linux|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Linux x64 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Linux|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Linux x64 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Linux|Nvidia"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Mac x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Mac|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Mac x64 DEPS Release (AMD)"
+    category: "chromium.dawn|DEPS|Mac|AMD"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Mac x64 DEPS Release (Intel)"
+    category: "chromium.dawn|DEPS|Mac|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Win10 x86 DEPS Builder"
+    category: "chromium.dawn|DEPS|Windows|Builder"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Win10 x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Windows|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Win10 x86 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Windows|Intel"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Win10 x64 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Windows|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Win10 x86 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Windows|Nvidia"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Win10 x64 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Windows|Nvidia"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/GPU Win x64 Builder"
+    category: "chromium.gpu|Windows"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Win10 x64 Release (NVIDIA)"
+    category: "chromium.gpu|Windows"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/GPU Mac Builder"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac Release (Intel)"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac Retina Release (AMD)"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/GPU Linux Builder"
+    category: "chromium.gpu|Linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Release (NVIDIA)"
+    category: "chromium.gpu|Linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android Release (Nexus 5X)"
+    category: "chromium.gpu|Android"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/ios-simulator-cronet"
+    category: "chromium.fyi|cronet"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/mac-osxbeta-rel"
+    category: "chromium.fyi|mac"
+    short_name: "beta"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/VR Linux"
+    category: "chromium.fyi|linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Ozone Tester (Headless)"
+    category: "chromium.fyi|linux"
+    short_name: "loh"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Ozone Tester (Wayland)"
+    category: "chromium.fyi|linux"
+    short_name: "low"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Ozone Tester (X11)"
+    category: "chromium.fyi|linux"
+    short_name: "lox"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Win10 Tests x64 1803"
+    category: "chromium.fyi|win10|1803"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "mirrors"
+  name: "Chromium CQ Mirrors Console"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win x64 Builder"
+    category: "chromium.win|release|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win 7 Tests x64 (1)"
+    category: "chromium.win|release|tester"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 Tests x64"
+    category: "chromium.win|release|tester"
+    short_name: "w10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win Builder (dbg)"
+    category: "chromium.win|debug|builder"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win7 Tests (dbg)(1)"
+    category: "chromium.win|debug|tester"
+    short_name: "7"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac Builder"
+    category: "chromium.mac|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
+    category: "chromium.mac|release"
+    short_name: "10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
+    category: "chromium.mac|release"
+    short_name: "11"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.12 Tests"
+    category: "chromium.mac|release"
+    short_name: "12"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.13 Tests"
+    category: "chromium.mac|release"
+    short_name: "13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.14 Tests"
+    category: "chromium.mac|release"
+    short_name: "14"
+  }
+  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"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.13 Tests (dbg)"
+    category: "chromium.mac|debug"
+    short_name: "13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator"
+    category: "chromium.mac|ios|default"
+    short_name: "sim"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-full-configs"
+    category: "chromium.mac|ios|default"
+    short_name: "ful"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Builder"
+    category: "chromium.linux|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Tests"
+    category: "chromium.linux|release"
+    short_name: "tst"
+  }
+  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)"
+    category: "chromium.linux|debug|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)"
+    category: "chromium.linux|debug|tester"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Cast Linux"
+    category: "chromium.linux|cast"
+    short_name: "vid"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Fuchsia ARM64"
+    category: "chromium.linux|fuchsia|a64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-arm64-cast"
+    category: "chromium.linux|fuchsia|cast"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-x64-cast"
+    category: "chromium.linux|fuchsia|cast"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Fuchsia x64"
+    category: "chromium.linux|fuchsia|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-chromeos-rel"
+    category: "chromium.chromiumos|default"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-chromeos-dbg"
+    category: "chromium.chromiumos|default"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-arm-generic-rel"
+    category: "chromium.chromiumos|simple|release"
+    short_name: "arm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel"
+    category: "chromium.chromiumos|simple|release|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-dbg"
+    category: "chromium.chromiumos|simple|debug|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-arm-dbg"
+    category: "chromium.android|cronet|arm"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-arm-rel"
+    category: "chromium.android|cronet|arm"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-kitkat-arm-rel"
+    category: "chromium.android|cronet|test"
+    short_name: "k"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-lollipop-arm-rel"
+    category: "chromium.android|cronet|test"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android arm Builder (dbg)"
+    category: "chromium.android|builder|arm"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android arm64 Builder (dbg)"
+    category: "chromium.android|builder|arm"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android x86 Builder (dbg)"
+    category: "chromium.android|builder|x86"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android x64 Builder (dbg)"
+    category: "chromium.android|builder|x86"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Marshmallow 64 bit Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Nougat Phone Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "N"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Oreo Phone Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "O"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-pie-arm64-dbg"
+    category: "chromium.android|tester|phone"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView M (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView N (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "N"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView O (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "O"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView P (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-nougat-arm64-rel"
+    category: "chromium.android|builder_tester|arm64"
+    short_name: "N"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-marshmallow-x86-rel"
+    category: "chromium.android|builder_tester|x86"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-lollipop-arm-rel"
+    category: "chromium.android|on_cq"
+    short_name: "L"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-marshmallow-arm64-rel"
+    category: "chromium.android|on_cq"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-pie-arm64-rel"
+    category: "chromium.android|on_cq"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Cast Android (dbg)"
+    category: "chromium.android|on_cq"
+    short_name: "cst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux TSan Builder"
+    category: "chromium.memory|linux|TSan v2"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux TSan Tests"
+    category: "chromium.memory|linux|TSan v2"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Builder"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Tests (1)"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ASan Tests (sandboxed)"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "sbx"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Linux|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Linux|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Linux|Nvidia"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Mac|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Release (AMD)"
+    category: "chromium.dawn|DEPS|Mac|AMD"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Release (Intel)"
+    category: "chromium.dawn|DEPS|Mac|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Builder"
+    category: "chromium.dawn|DEPS|Windows|Builder"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Windows|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Windows|Intel"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Windows|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Windows|Nvidia"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Windows|Nvidia"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Win x64 Builder"
+    category: "chromium.gpu|Windows"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 x64 Release (NVIDIA)"
+    category: "chromium.gpu|Windows"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Mac Builder"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac Release (Intel)"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac Retina Release (AMD)"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Linux Builder"
+    category: "chromium.gpu|Linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Release (NVIDIA)"
+    category: "chromium.gpu|Linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android Release (Nexus 5X)"
+    category: "chromium.gpu|Android"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-cronet"
+    category: "chromium.fyi|cronet"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-arm64"
+    category: "chromium.fyi|mac"
+    short_name: "arm64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-osxbeta-rel"
+    category: "chromium.fyi|mac"
+    short_name: "beta"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-official"
+    category: "chromium.fyi|fuchsia"
+    short_name: "off"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/VR Linux"
+    category: "chromium.fyi|linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (Headless)"
+    category: "chromium.fyi|linux"
+    short_name: "loh"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (Wayland)"
+    category: "chromium.fyi|linux"
+    short_name: "low"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (X11)"
+    category: "chromium.fyi|linux"
+    short_name: "lox"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-official"
+    category: "chromium.fyi|linux"
+    short_name: "off"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 Tests x64 1803"
+    category: "chromium.fyi|win10|1803"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-official"
+    category: "chromium.fyi|android"
+    short_name: "off"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "mirrors-m83"
+  name: "Chromium M83 CQ Mirrors Console"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/branch-heads/4103"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Win x64 Builder"
+    category: "chromium.win|release|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Win 7 Tests x64 (1)"
+    category: "chromium.win|release|tester"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Win10 Tests x64"
+    category: "chromium.win|release|tester"
+    short_name: "w10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Win Builder (dbg)"
+    category: "chromium.win|debug|builder"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Win7 Tests (dbg)(1)"
+    category: "chromium.win|debug|tester"
+    short_name: "7"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac Builder"
+    category: "chromium.mac|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac10.10 Tests"
+    category: "chromium.mac|release"
+    short_name: "10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac10.11 Tests"
+    category: "chromium.mac|release"
+    short_name: "11"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac10.12 Tests"
+    category: "chromium.mac|release"
+    short_name: "12"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac10.13 Tests"
+    category: "chromium.mac|release"
+    short_name: "13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac10.14 Tests"
+    category: "chromium.mac|release"
+    short_name: "14"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/WebKit Mac10.13 (retina)"
+    category: "chromium.mac|release"
+    short_name: "ret"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac Builder (dbg)"
+    category: "chromium.mac|debug"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac10.13 Tests (dbg)"
+    category: "chromium.mac|debug"
+    short_name: "13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/ios-simulator"
+    category: "chromium.mac|ios|default"
+    short_name: "sim"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/ios-simulator-full-configs"
+    category: "chromium.mac|ios|default"
+    short_name: "ful"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Builder"
+    category: "chromium.linux|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Tests"
+    category: "chromium.linux|release"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/linux-ozone-rel"
+    category: "chromium.linux|release"
+    short_name: "ozo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Builder (dbg)"
+    category: "chromium.linux|debug|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Tests (dbg)(1)"
+    category: "chromium.linux|debug|tester"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Cast Linux"
+    category: "chromium.linux|cast"
+    short_name: "vid"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Fuchsia ARM64"
+    category: "chromium.linux|fuchsia|a64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/fuchsia-arm64-cast"
+    category: "chromium.linux|fuchsia|cast"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/fuchsia-x64-cast"
+    category: "chromium.linux|fuchsia|cast"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Fuchsia x64"
+    category: "chromium.linux|fuchsia|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/linux-chromeos-rel"
+    category: "chromium.chromiumos|default"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/linux-chromeos-dbg"
+    category: "chromium.chromiumos|default"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/chromeos-arm-generic-rel"
+    category: "chromium.chromiumos|simple|release"
+    short_name: "arm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/chromeos-amd64-generic-rel"
+    category: "chromium.chromiumos|simple|release|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/chromeos-amd64-generic-dbg"
+    category: "chromium.chromiumos|simple|debug|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-cronet-arm-dbg"
+    category: "chromium.android|cronet|arm"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-cronet-arm-rel"
+    category: "chromium.android|cronet|arm"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-cronet-kitkat-arm-rel"
+    category: "chromium.android|cronet|test"
+    short_name: "k"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-cronet-lollipop-arm-rel"
+    category: "chromium.android|cronet|test"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android arm Builder (dbg)"
+    category: "chromium.android|builder|arm"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android arm64 Builder (dbg)"
+    category: "chromium.android|builder|arm"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android x86 Builder (dbg)"
+    category: "chromium.android|builder|x86"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android x64 Builder (dbg)"
+    category: "chromium.android|builder|x86"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Marshmallow 64 bit Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Nougat Phone Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "N"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Oreo Phone Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "O"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-pie-arm64-dbg"
+    category: "chromium.android|tester|phone"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android WebView M (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android WebView N (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "N"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android WebView O (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "O"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android WebView P (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-lollipop-arm-rel"
+    category: "chromium.android|on_cq"
+    short_name: "L"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-marshmallow-arm64-rel"
+    category: "chromium.android|on_cq"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/android-pie-arm64-rel"
+    category: "chromium.android|on_cq"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Cast Android (dbg)"
+    category: "chromium.android|on_cq"
+    short_name: "cst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux TSan Builder"
+    category: "chromium.memory|linux|TSan v2"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux TSan Tests"
+    category: "chromium.memory|linux|TSan v2"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux ASan LSan Builder"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux ASan LSan Tests (1)"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux ASan Tests (sandboxed)"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "sbx"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Linux x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Linux|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Linux x64 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Linux|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Linux x64 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Linux|Nvidia"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Mac x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Mac|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Mac x64 DEPS Release (AMD)"
+    category: "chromium.dawn|DEPS|Mac|AMD"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Mac x64 DEPS Release (Intel)"
+    category: "chromium.dawn|DEPS|Mac|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Win10 x86 DEPS Builder"
+    category: "chromium.dawn|DEPS|Windows|Builder"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Win10 x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Windows|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Win10 x86 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Windows|Intel"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Win10 x64 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Windows|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Win10 x86 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Windows|Nvidia"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Dawn Win10 x64 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Windows|Nvidia"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/GPU Win x64 Builder"
+    category: "chromium.gpu|Windows"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Win10 x64 Release (NVIDIA)"
+    category: "chromium.gpu|Windows"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/GPU Mac Builder"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac Release (Intel)"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Mac Retina Release (AMD)"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/GPU Linux Builder"
+    category: "chromium.gpu|Linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Release (NVIDIA)"
+    category: "chromium.gpu|Linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Android Release (Nexus 5X)"
+    category: "chromium.gpu|Android"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/ios-simulator-cronet"
+    category: "chromium.fyi|cronet"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/mac-osxbeta-rel"
+    category: "chromium.fyi|mac"
+    short_name: "beta"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/VR Linux"
+    category: "chromium.fyi|linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Ozone Tester (Headless)"
+    category: "chromium.fyi|linux"
+    short_name: "loh"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Ozone Tester (Wayland)"
+    category: "chromium.fyi|linux"
+    short_name: "low"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Linux Ozone Tester (X11)"
+    category: "chromium.fyi|linux"
+    short_name: "lox"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m83/Win10 Tests x64 1803"
+    category: "chromium.fyi|win10|1803"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "mirrors-m84"
+  name: "Chromium M84 CQ Mirrors Console"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/branch-heads/4147"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Win x64 Builder"
+    category: "chromium.win|release|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Win 7 Tests x64 (1)"
+    category: "chromium.win|release|tester"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Win10 Tests x64"
+    category: "chromium.win|release|tester"
+    short_name: "w10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Win Builder (dbg)"
+    category: "chromium.win|debug|builder"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Win7 Tests (dbg)(1)"
+    category: "chromium.win|debug|tester"
+    short_name: "7"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac Builder"
+    category: "chromium.mac|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac10.10 Tests"
+    category: "chromium.mac|release"
+    short_name: "10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac10.11 Tests"
+    category: "chromium.mac|release"
+    short_name: "11"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac10.12 Tests"
+    category: "chromium.mac|release"
+    short_name: "12"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac10.13 Tests"
+    category: "chromium.mac|release"
+    short_name: "13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac10.14 Tests"
+    category: "chromium.mac|release"
+    short_name: "14"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/WebKit Mac10.13 (retina)"
+    category: "chromium.mac|release"
+    short_name: "ret"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac Builder (dbg)"
+    category: "chromium.mac|debug"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac10.13 Tests (dbg)"
+    category: "chromium.mac|debug"
+    short_name: "13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/ios-simulator"
+    category: "chromium.mac|ios|default"
+    short_name: "sim"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/ios-simulator-full-configs"
+    category: "chromium.mac|ios|default"
+    short_name: "ful"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Builder"
+    category: "chromium.linux|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Tests"
+    category: "chromium.linux|release"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/linux-ozone-rel"
+    category: "chromium.linux|release"
+    short_name: "ozo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Builder (dbg)"
+    category: "chromium.linux|debug|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Tests (dbg)(1)"
+    category: "chromium.linux|debug|tester"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Cast Linux"
+    category: "chromium.linux|cast"
+    short_name: "vid"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Fuchsia ARM64"
+    category: "chromium.linux|fuchsia|a64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/fuchsia-arm64-cast"
+    category: "chromium.linux|fuchsia|cast"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/fuchsia-x64-cast"
+    category: "chromium.linux|fuchsia|cast"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Fuchsia x64"
+    category: "chromium.linux|fuchsia|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/linux-chromeos-rel"
+    category: "chromium.chromiumos|default"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/linux-chromeos-dbg"
+    category: "chromium.chromiumos|default"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/chromeos-arm-generic-rel"
+    category: "chromium.chromiumos|simple|release"
+    short_name: "arm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/chromeos-amd64-generic-rel"
+    category: "chromium.chromiumos|simple|release|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/chromeos-amd64-generic-dbg"
+    category: "chromium.chromiumos|simple|debug|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-cronet-arm-dbg"
+    category: "chromium.android|cronet|arm"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-cronet-arm-rel"
+    category: "chromium.android|cronet|arm"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-cronet-kitkat-arm-rel"
+    category: "chromium.android|cronet|test"
+    short_name: "k"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-cronet-lollipop-arm-rel"
+    category: "chromium.android|cronet|test"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android arm Builder (dbg)"
+    category: "chromium.android|builder|arm"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android arm64 Builder (dbg)"
+    category: "chromium.android|builder|arm"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android x86 Builder (dbg)"
+    category: "chromium.android|builder|x86"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android x64 Builder (dbg)"
+    category: "chromium.android|builder|x86"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Marshmallow 64 bit Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Nougat Phone Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "N"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Oreo Phone Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "O"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-pie-arm64-dbg"
+    category: "chromium.android|tester|phone"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android WebView M (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android WebView N (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "N"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android WebView O (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "O"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android WebView P (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-lollipop-arm-rel"
+    category: "chromium.android|on_cq"
+    short_name: "L"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-marshmallow-arm64-rel"
+    category: "chromium.android|on_cq"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/android-pie-arm64-rel"
+    category: "chromium.android|on_cq"
+    short_name: "P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Cast Android (dbg)"
+    category: "chromium.android|on_cq"
+    short_name: "cst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux TSan Builder"
+    category: "chromium.memory|linux|TSan v2"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux TSan Tests"
+    category: "chromium.memory|linux|TSan v2"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux ASan LSan Builder"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux ASan LSan Tests (1)"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux ASan Tests (sandboxed)"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "sbx"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Linux x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Linux|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Linux x64 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Linux|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Linux x64 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Linux|Nvidia"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Mac x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Mac|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Mac x64 DEPS Release (AMD)"
+    category: "chromium.dawn|DEPS|Mac|AMD"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Mac x64 DEPS Release (Intel)"
+    category: "chromium.dawn|DEPS|Mac|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Win10 x86 DEPS Builder"
+    category: "chromium.dawn|DEPS|Windows|Builder"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Win10 x64 DEPS Builder"
+    category: "chromium.dawn|DEPS|Windows|Builder"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Win10 x86 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Windows|Intel"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Win10 x64 DEPS Release (Intel HD 630)"
+    category: "chromium.dawn|DEPS|Windows|Intel"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Win10 x86 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Windows|Nvidia"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Dawn Win10 x64 DEPS Release (NVIDIA)"
+    category: "chromium.dawn|DEPS|Windows|Nvidia"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/GPU Win x64 Builder"
+    category: "chromium.gpu|Windows"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Win10 x64 Release (NVIDIA)"
+    category: "chromium.gpu|Windows"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/GPU Mac Builder"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac Release (Intel)"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Mac Retina Release (AMD)"
+    category: "chromium.gpu|Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/GPU Linux Builder"
+    category: "chromium.gpu|Linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Release (NVIDIA)"
+    category: "chromium.gpu|Linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Android Release (Nexus 5X)"
+    category: "chromium.gpu|Android"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/ios-simulator-cronet"
+    category: "chromium.fyi|cronet"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/mac-osxbeta-rel"
+    category: "chromium.fyi|mac"
+    short_name: "beta"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/VR Linux"
+    category: "chromium.fyi|linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Ozone Tester (Headless)"
+    category: "chromium.fyi|linux"
+    short_name: "loh"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Ozone Tester (Wayland)"
+    category: "chromium.fyi|linux"
+    short_name: "low"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Linux Ozone Tester (X11)"
+    category: "chromium.fyi|linux"
+    short_name: "lox"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci-m84/Win10 Tests x64 1803"
+    category: "chromium.fyi|win10|1803"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "sheriff.ios"
+  name: "iOS Sheriff Console"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-device"
+    category: "chromium.mac"
+    short_name: "dev"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator"
+    category: "chromium.mac"
+    short_name: "sim"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-full-configs"
+    category: "chromium.mac"
+    short_name: "ful"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-noncq"
+    category: "chromium.mac"
+    short_name: "non"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios13-sdk-device"
+    category: "chromium.fyi|13"
+    short_name: "dev"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios13-sdk-simulator"
+    category: "chromium.fyi|13"
+    short_name: "sim"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios13-beta-simulator"
+    category: "chromium.fyi|13"
+    short_name: "ios13"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "try"
+  name: "Chromium CQ console"
+  builders {
+    name: "buildbucket/luci.chromium.try/android-binary-size"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-cronet-arm-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-lollipop-arm-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-marshmallow-arm64-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-marshmallow-x86-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-nougat-arm64-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-official"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-pie-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-pie-arm64-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_compile_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_compile_x64_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_compile_x86_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_cronet"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_optional_gpu_tests_rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/cast_shell_android"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/cast_shell_linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/chromeos-amd64-generic-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/chromeos-amd64-generic-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/chromeos-arm-generic-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/chromeos-kevin-compile-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/chromeos-kevin-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/chromium_presubmit"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/closure_compilation"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/dawn-linux-x64-deps-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/dawn-mac-x64-deps-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/dawn-win10-x64-deps-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/dawn-win10-x86-deps-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia-arm64-cast"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia-official"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia-x64-cast"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia_arm64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia_x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-simulator"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-simulator-cronet"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-simulator-full-configs"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-chromeos-compile-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-chromeos-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-libfuzzer-asan-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-official"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-ozone-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_asan_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_compile_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_tsan_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_layout_tests_composite_after_paint"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_layout_tests_layout_ng_disabled"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_optional_gpu_tests_rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_vr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_compile_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_optional_gpu_tests_rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-libfuzzer-asan-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win10_chromium_x64_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_chromium_compile_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_optional_gpu_tests_rel"
+  }
+  builder_view_only: true
+}
+consoles {
+  id: "try-m83"
+  name: "Chromium M83 CQ console"
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/android-binary-size"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/android-cronet-arm-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/android-lollipop-arm-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/android-marshmallow-arm64-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/android-pie-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/android-pie-arm64-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/android_compile_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/android_compile_x64_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/android_compile_x86_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/android_cronet"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/android_optional_gpu_tests_rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/cast_shell_android"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/cast_shell_linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/chromeos-amd64-generic-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/chromeos-amd64-generic-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/chromeos-arm-generic-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/chromium_presubmit"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/closure_compilation"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/dawn-linux-x64-deps-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/dawn-mac-x64-deps-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/dawn-win10-x64-deps-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/dawn-win10-x86-deps-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/fuchsia-arm64-cast"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/fuchsia-x64-cast"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/fuchsia_arm64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/fuchsia_x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/ios-simulator"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/ios-simulator-cronet"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/ios-simulator-full-configs"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/linux-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/linux-chromeos-compile-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/linux-chromeos-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/linux-libfuzzer-asan-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/linux-ozone-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/linux-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/linux_chromium_asan_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/linux_chromium_compile_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/linux_chromium_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/linux_chromium_tsan_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/linux_layout_tests_composite_after_paint"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/linux_layout_tests_layout_ng_disabled"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/linux_optional_gpu_tests_rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/linux_vr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/mac-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/mac_chromium_compile_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/mac_optional_gpu_tests_rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/win-libfuzzer-asan-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/win10_chromium_x64_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/win_chromium_compile_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m83/win_optional_gpu_tests_rel"
+  }
+  builder_view_only: true
+}
+consoles {
+  id: "try-m84"
+  name: "Chromium M84 CQ console"
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/android-binary-size"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/android-cronet-arm-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/android-lollipop-arm-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/android-marshmallow-arm64-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/android-pie-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/android-pie-arm64-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/android_compile_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/android_compile_x64_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/android_compile_x86_dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/android_cronet"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/android_optional_gpu_tests_rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/cast_shell_android"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/cast_shell_linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/chromeos-amd64-generic-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/chromeos-amd64-generic-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/chromeos-arm-generic-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/chromium_presubmit"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/closure_compilation"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/dawn-linux-x64-deps-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/dawn-mac-x64-deps-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/dawn-win10-x64-deps-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/dawn-win10-x86-deps-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/fuchsia-arm64-cast"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/fuchsia-x64-cast"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/fuchsia_arm64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/fuchsia_x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/ios-simulator"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/ios-simulator-cronet"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/ios-simulator-full-configs"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/linux-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/linux-chromeos-compile-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/linux-chromeos-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/linux-libfuzzer-asan-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/linux-ozone-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/linux-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/linux_chromium_asan_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/linux_chromium_compile_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/linux_chromium_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/linux_chromium_tsan_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/linux_layout_tests_composite_after_paint"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/linux_layout_tests_layout_ng_disabled"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/linux_optional_gpu_tests_rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/linux_vr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/mac-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/mac_chromium_compile_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/mac_optional_gpu_tests_rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/win-libfuzzer-asan-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/win10_chromium_x64_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/win_chromium_compile_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try-m84/win_optional_gpu_tests_rel"
+  }
+  builder_view_only: true
+}
+consoles {
+  id: "android.packager"
+  name: "android.packager"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-avd-packager"
+    short_name: "avd"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-sdk-packager"
+    short_name: "sdk"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "chromium"
+  name: "chromium"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-archive-dbg"
+    category: "android"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-archive-rel"
+    category: "android"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-archive-dbg"
+    category: "linux"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-archive-rel"
+    category: "linux"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-archive-dbg"
+    category: "mac"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-archive-rel"
+    category: "mac"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win32-archive-dbg"
+    category: "win|dbg"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-archive-dbg"
+    category: "win|dbg"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win32-archive-rel"
+    category: "win|rel"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-archive-rel"
+    category: "win|rel"
+    short_name: "64"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+  include_experimental_builds: true
+}
+consoles {
   id: "chromium.android"
   name: "chromium.android"
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
+  builders {
     name: "buildbucket/luci.chromium.ci/android-cronet-arm-dbg"
     category: "cronet|arm"
     short_name: "dbg"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/android-cronet-arm-rel"
     category: "cronet|arm"
     short_name: "rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-arm64-dbg"
+    category: "cronet|arm64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-arm64-rel"
+    category: "cronet|arm64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-x86-dbg"
+    category: "cronet|x86"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-x86-rel"
+    category: "cronet|x86"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-asan-arm-rel"
+    category: "cronet|asan"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/android-cronet-kitkat-arm-rel"
     category: "cronet|test"
     short_name: "k"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/android-cronet-lollipop-arm-rel"
     category: "cronet|test"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-marshmallow-arm64-rel"
+    category: "cronet|test"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-marshmallow-arm64-perf-rel"
+    category: "cronet|test|perf"
+    short_name: "m"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Android arm Builder (dbg)"
     category: "builder|arm"
     short_name: "32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Android arm64 Builder (dbg)"
     category: "builder|arm"
     short_name: "64"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android ASAN (dbg)"
+    category: "builder|arm"
+    short_name: "san"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Android x86 Builder (dbg)"
     category: "builder|x86"
     short_name: "32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Android x64 Builder (dbg)"
     category: "builder|x86"
     short_name: "64"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Android"
+    category: "builder|det"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Android (dbg)"
+    category: "builder|det"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-binary-size-generator"
+    category: "builder|other"
+    short_name: "size"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Lollipop Phone Tester"
+    category: "tester|phone"
+    short_name: "L"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Marshmallow 64 bit Tester"
     category: "tester|phone"
     short_name: "M"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Nougat Phone Tester"
     category: "tester|phone"
     short_name: "N"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Oreo Phone Tester"
     category: "tester|phone"
     short_name: "O"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/android-pie-arm64-dbg"
     category: "tester|phone"
     short_name: "P"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Lollipop Tablet Tester"
+    category: "tester|tablet"
+    short_name: "L"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Marshmallow Tablet Tester"
+    category: "tester|tablet"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-incremental-dbg"
+    category: "tester|incremental"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView L (dbg)"
+    category: "tester|webview"
+    short_name: "L"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Android WebView M (dbg)"
     category: "tester|webview"
     short_name: "M"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Android WebView N (dbg)"
     category: "tester|webview"
     short_name: "N"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Android WebView O (dbg)"
     category: "tester|webview"
     short_name: "O"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Android WebView P (dbg)"
     category: "tester|webview"
     short_name: "P"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-arm64-proguard-rel"
+    category: "builder_tester|arm64"
+    short_name: "M proguard"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-10-arm64-rel"
+    category: "builder_tester|arm64"
+    short_name: "10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-nougat-arm64-rel"
+    category: "builder_tester|arm64"
+    short_name: "N"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-marshmallow-x86-rel"
+    category: "builder_tester|x86"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-pie-x86-rel"
+    category: "builder_tester|x86"
+    short_name: "P"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/android-lollipop-arm-rel"
     category: "on_cq"
     short_name: "L"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/android-marshmallow-arm64-rel"
     category: "on_cq"
     short_name: "M"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/android-pie-arm64-rel"
     category: "on_cq"
     short_name: "P"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Cast Android (dbg)"
     category: "on_cq"
     short_name: "cst"
-  >
-  header: <
-    oncalls: <
+  }
+  header {
+    oncalls {
       name: "Chromium"
-      url: "https://rota-ng.appspot.com/legacy/sheriff.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
       name: "Android"
-      url: "https://rota-ng.appspot.com/legacy/sheriff_android.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
       name: "iOS"
       url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "GPU"
       url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Angle"
       url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perf"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perfbot"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Trooper"
       url: "https://rota-ng.appspot.com/legacy/trooper.json"
-    >
-    links: <
+    }
+    links {
       name: "Builds"
-      links: <
+      links {
         text: "continuous"
         url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
         alt: "Continuous browser snapshots"
-      >
-      links: <
+      }
+      links {
         text: "symbols"
         url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
         alt: "Windows Symbols"
-      >
-      links: <
+      }
+      links {
         text: "status"
         url: "https://chromium-status.appspot.com/"
         alt: "Current tree status"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Dashboards"
-      links: <
+      links {
         text: "perf"
         url: "https://chromeperf.appspot.com/"
         alt: "Chrome perf dashboard"
-      >
-      links: <
+      }
+      links {
         text: "flake-portal"
         url: "https://analysis.chromium.org/p/chromium/flake-portal"
         alt: "New flake portal"
-      >
-      links: <
+      }
+      links {
         text: "legacy-flakiness"
         url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
         alt: "Legacy flakiness dashboard"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Chromium"
-      links: <
+      links {
         text: "source"
         url: "https://chromium.googlesource.com/chromium/src"
         alt: "Chromium source code repository"
-      >
-      links: <
+      }
+      links {
         text: "reviews"
         url: "https://chromium-review.googlesource.com"
         alt: "Chromium code review tool"
-      >
-      links: <
+      }
+      links {
         text: "bugs"
         url: "https://crbug.com"
         alt: "Chromium bug tracker"
-      >
-      links: <
+      }
+      links {
         text: "coverage"
         url: "https://analysis.chromium.org/p/chromium/coverage"
         alt: "Chromium code coverage dashboard"
-      >
-      links: <
+      }
+      links {
         text: "dev"
         url: "https://dev.chromium.org/Home"
         alt: "Chromium developer home page"
-      >
-      links: <
+      }
+      links {
         text: "support"
         url: "https://support.google.com/chrome/#topic=7438008"
         alt: "Google Chrome help center"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/chromium.android"
         alt: "Chromium Android console"
-      >
-      links: <
+      }
+      links {
         text: "clang"
         url: "/p/chromium/g/chromium.clang"
         alt: "Chromium Clang console"
-      >
-      links: <
+      }
+      links {
         text: "dawn"
         url: "/p/chromium/g/chromium.dawn"
         alt: "Chromium Dawn console"
-      >
-      links: <
+      }
+      links {
         text: "fuzz"
         url: "/p/chromium/g/chromium.fuzz"
         alt: "Chromium Fuzz console"
-      >
-      links: <
+      }
+      links {
         text: "fyi"
         url: "/p/chromium/g/chromium.fyi"
         alt: "Chromium FYI console"
-      >
-      links: <
+      }
+      links {
         text: "gpu"
         url: "/p/chromium/g/chromium.gpu"
         alt: "Chromium GPU console"
-      >
-      links: <
+      }
+      links {
         text: "perf"
         url: "/p/chrome/g/chrome.perf/console"
         alt: "Chromium Perf console"
-      >
-      links: <
+      }
+      links {
         text: "perf.fyi"
         url: "/p/chrome/g/chrome.perf.fyi/console"
         alt: "Chromium Perf FYI console"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/chromium.swangle"
         alt: "Chromium SWANGLE console"
-      >
-      links: <
+      }
+      links {
         text: "webrtc"
         url: "/p/chromium/g/chromium.webrtc"
         alt: "Chromium WebRTC console"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/chromium.chromiumos"
         alt: "ChromiumOS console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Branch Consoles"
-      links: <
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
         text: "m83"
         url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "chromium.android.fyi"
+  name: "chromium.android.fyi"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-bfcache-rel"
+    category: "android"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android CFI"
+    category: "memory"
+    short_name: "cfi"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebLayer P FYI (rel)"
+    category: "weblayer"
+    short_name: "p-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-weblayer-pie-x86-fyi-rel"
+    category: "weblayer"
+    short_name: "p-x86-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView P Blink-CORS FYI (rel)"
+    category: "webview"
+    short_name: "cors"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView P FYI (rel)"
+    category: "webview"
+    short_name: "p-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-marshmallow-x86-fyi-rel"
+    category: "emulator|M|x86"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-pie-x86-fyi-rel"
+    category: "emulator|P|x86"
+    short_name: "rel"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
         alt: "Beta branch console"
-      >
-      links: <
-        text: "m81"
-        url: "/p/chromium/g/main-m81/console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
         alt: "Stable branch console"
-      >
-      links: <
+      }
+      links {
         text: "trunk"
         url: "/p/chromium/g/main/console"
         alt: "Trunk (ToT) console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Tryservers"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/tryserver.chromium.android/builders"
         alt: "Android"
-      >
-      links: <
+      }
+      links {
         text: "angle"
         url: "/p/chromium/g/tryserver.chromium.angle/builders"
         alt: "Angle"
-      >
-      links: <
+      }
+      links {
         text: "blink"
         url: "/p/chromium/g/tryserver.blink/builders"
         alt: "Blink"
-      >
-      links: <
+      }
+      links {
         text: "chrome"
         url: "/p/chrome/g/tryserver.chrome/builders"
         alt: "Chrome"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
-      >
-      links: <
+      }
+      links {
         text: "linux"
         url: "/p/chromium/g/tryserver.chromium.linux/builders"
         alt: "Linux"
-      >
-      links: <
+      }
+      links {
         text: "mac"
         url: "/p/chromium/g/tryserver.chromium.mac/builders"
         alt: "Mac"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/tryserver.chromium.swangle/builders"
         alt: "SWANGLE"
-      >
-      links: <
+      }
+      links {
         text: "win"
         url: "/p/chromium/g/tryserver.chromium.win/builders"
         alt: "Win"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Navigate"
-      links: <
+      links {
         text: "about"
         url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
         alt: "Tour of the console"
-      >
-      links: <
+      }
+      links {
         text: "customize"
         url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
         alt: "Customize this console"
-      >
-    >
-    console_groups: <
-      title: <
+      }
+    }
+    console_groups {
+      title {
         text: "Tree Closers"
         url: "https://chromium-status.appspot.com/"
-      >
+      }
       console_ids: "chromium/chromium"
       console_ids: "chromium/chromium.win"
       console_ids: "chromium/chromium.mac"
@@ -362,296 +6257,793 @@ consoles: <
       console_ids: "chrome/chrome"
       console_ids: "chromium/chromium.memory"
       console_ids: "chromium/chromium.gpu"
-    >
-    console_groups: <
+    }
+    console_groups {
       console_ids: "chromium/chromium.android"
       console_ids: "chrome/chrome.perf"
       console_ids: "chromium/chromium.gpu.fyi"
       console_ids: "chromium/chromium.fuzz"
-    >
+    }
     tree_status_host: "chromium-status.appspot.com"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "chromium.chromiumos"
   name: "chromium.chromiumos"
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS Full"
+    category: "default"
+    short_name: "ful"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/linux-chromeos-rel"
     category: "default"
     short_name: "rel"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/linux-chromeos-dbg"
     category: "default"
     short_name: "dbg"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/chromeos-arm-generic-rel"
     category: "simple|release"
     short_name: "arm"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/chromeos-kevin-rel"
     category: "simple|release"
     short_name: "kvn"
-  >
-  builders: <
+  }
+  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|x64"
+    short_name: "cfi"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel"
     category: "simple|release|x64"
     short_name: "rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-arm-generic-dbg"
+    category: "simple|debug"
+    short_name: "arm"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-dbg"
     category: "simple|debug|x64"
     short_name: "dbg"
-  >
-  header: <
-    oncalls: <
+  }
+  header {
+    oncalls {
       name: "Chromium"
-      url: "https://rota-ng.appspot.com/legacy/sheriff.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
       name: "Android"
-      url: "https://rota-ng.appspot.com/legacy/sheriff_android.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
       name: "iOS"
       url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "GPU"
       url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Angle"
       url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perf"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perfbot"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Trooper"
       url: "https://rota-ng.appspot.com/legacy/trooper.json"
-    >
-    links: <
+    }
+    links {
       name: "Builds"
-      links: <
+      links {
         text: "continuous"
         url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
         alt: "Continuous browser snapshots"
-      >
-      links: <
+      }
+      links {
         text: "symbols"
         url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
         alt: "Windows Symbols"
-      >
-      links: <
+      }
+      links {
         text: "status"
         url: "https://chromium-status.appspot.com/"
         alt: "Current tree status"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Dashboards"
-      links: <
+      links {
         text: "perf"
         url: "https://chromeperf.appspot.com/"
         alt: "Chrome perf dashboard"
-      >
-      links: <
+      }
+      links {
         text: "flake-portal"
         url: "https://analysis.chromium.org/p/chromium/flake-portal"
         alt: "New flake portal"
-      >
-      links: <
+      }
+      links {
         text: "legacy-flakiness"
         url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
         alt: "Legacy flakiness dashboard"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Chromium"
-      links: <
+      links {
         text: "source"
         url: "https://chromium.googlesource.com/chromium/src"
         alt: "Chromium source code repository"
-      >
-      links: <
+      }
+      links {
         text: "reviews"
         url: "https://chromium-review.googlesource.com"
         alt: "Chromium code review tool"
-      >
-      links: <
+      }
+      links {
         text: "bugs"
         url: "https://crbug.com"
         alt: "Chromium bug tracker"
-      >
-      links: <
+      }
+      links {
         text: "coverage"
         url: "https://analysis.chromium.org/p/chromium/coverage"
         alt: "Chromium code coverage dashboard"
-      >
-      links: <
+      }
+      links {
         text: "dev"
         url: "https://dev.chromium.org/Home"
         alt: "Chromium developer home page"
-      >
-      links: <
+      }
+      links {
         text: "support"
         url: "https://support.google.com/chrome/#topic=7438008"
         alt: "Google Chrome help center"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/chromium.android"
         alt: "Chromium Android console"
-      >
-      links: <
+      }
+      links {
         text: "clang"
         url: "/p/chromium/g/chromium.clang"
         alt: "Chromium Clang console"
-      >
-      links: <
+      }
+      links {
         text: "dawn"
         url: "/p/chromium/g/chromium.dawn"
         alt: "Chromium Dawn console"
-      >
-      links: <
+      }
+      links {
         text: "fuzz"
         url: "/p/chromium/g/chromium.fuzz"
         alt: "Chromium Fuzz console"
-      >
-      links: <
+      }
+      links {
         text: "fyi"
         url: "/p/chromium/g/chromium.fyi"
         alt: "Chromium FYI console"
-      >
-      links: <
+      }
+      links {
         text: "gpu"
         url: "/p/chromium/g/chromium.gpu"
         alt: "Chromium GPU console"
-      >
-      links: <
+      }
+      links {
         text: "perf"
         url: "/p/chrome/g/chrome.perf/console"
         alt: "Chromium Perf console"
-      >
-      links: <
+      }
+      links {
         text: "perf.fyi"
         url: "/p/chrome/g/chrome.perf.fyi/console"
         alt: "Chromium Perf FYI console"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/chromium.swangle"
         alt: "Chromium SWANGLE console"
-      >
-      links: <
+      }
+      links {
         text: "webrtc"
         url: "/p/chromium/g/chromium.webrtc"
         alt: "Chromium WebRTC console"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/chromium.chromiumos"
         alt: "ChromiumOS console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Branch Consoles"
-      links: <
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
         text: "m83"
         url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "chromium.clang"
+  name: "chromium.clang"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/UBSanVptr Linux"
+    short_name: "usn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTLinux"
+    category: "ToT Linux"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chrome.ci/ToTLinuxOfficial"
+    category: "ToT Linux"
+    short_name: "ofi"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTLinux (dbg)"
+    category: "ToT Linux"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTLinuxASan"
+    category: "ToT Linux"
+    short_name: "asn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTLinuxASanLibfuzzer"
+    category: "ToT Linux"
+    short_name: "fuz"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTLinuxMSan"
+    category: "ToT Linux"
+    short_name: "msn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTLinuxTSan"
+    category: "ToT Linux"
+    short_name: "tsn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTLinuxThinLTO"
+    category: "ToT Linux"
+    short_name: "lto"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTLinuxUBSanVptr"
+    category: "ToT Linux"
+    short_name: "usn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTAndroid"
+    category: "ToT Android"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTAndroid (dbg)"
+    category: "ToT Android"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTAndroid x64"
+    category: "ToT Android"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTAndroid64"
+    category: "ToT Android"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTAndroidASan"
+    category: "ToT Android"
+    short_name: "asn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTAndroidCFI"
+    category: "ToT Android"
+    short_name: "cfi"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTAndroidOfficial"
+    category: "ToT Android"
+    short_name: "off"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTMac"
+    category: "ToT Mac"
+    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"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTMacASan"
+    category: "ToT Mac"
+    short_name: "asn"
+  }
+  builders {
+    name: "buildbucket/luci.chrome.ci/ToTWin"
+    category: "ToT Windows"
+    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"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTWin(dll)"
+    category: "ToT Windows"
+    short_name: "dll"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-win_cross-rel"
+    category: "ToT Windows"
+    short_name: "lxw"
+  }
+  builders {
+    name: "buildbucket/luci.chrome.ci/ToTWin64"
+    category: "ToT Windows|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTWin64(dbg)"
+    category: "ToT Windows|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTWin64(dll)"
+    category: "ToT Windows|x64"
+    short_name: "dll"
+  }
+  builders {
+    name: "buildbucket/luci.chrome.ci/ToTWinThinLTO64"
+    category: "ToT Windows|x64"
+    short_name: "lto"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/CrWinAsan"
+    category: "ToT Windows|Asan"
+    short_name: "asn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/CrWinAsan(dll)"
+    category: "ToT Windows|Asan"
+    short_name: "dll"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTWinASanLibfuzzer"
+    category: "ToT Windows|Asan"
+    short_name: "fuz"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTLinuxCoverage"
+    category: "ToT Code Coverage"
+    short_name: "linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTMacCoverage"
+    category: "ToT Code Coverage"
+    short_name: "mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/CFI Linux CF"
+    category: "CFI|Linux"
+    short_name: "CF"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/CFI Linux ToT"
+    category: "CFI|Linux"
+    short_name: "ToT"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTWinCFI"
+    category: "CFI|Win"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTWinCFI64"
+    category: "CFI|Win"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTiOS"
+    category: "iOS|public"
+    short_name: "sim"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ToTiOSDevice"
+    category: "iOS|public"
+    short_name: "dev"
+  }
+  builders {
+    name: "buildbucket/luci.chrome.ci/clang-tot-device"
+    category: "iOS|internal"
+    short_name: "dev"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
         alt: "Beta branch console"
-      >
-      links: <
-        text: "m81"
-        url: "/p/chromium/g/main-m81/console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
         alt: "Stable branch console"
-      >
-      links: <
+      }
+      links {
         text: "trunk"
         url: "/p/chromium/g/main/console"
         alt: "Trunk (ToT) console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Tryservers"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/tryserver.chromium.android/builders"
         alt: "Android"
-      >
-      links: <
+      }
+      links {
         text: "angle"
         url: "/p/chromium/g/tryserver.chromium.angle/builders"
         alt: "Angle"
-      >
-      links: <
+      }
+      links {
         text: "blink"
         url: "/p/chromium/g/tryserver.blink/builders"
         alt: "Blink"
-      >
-      links: <
+      }
+      links {
         text: "chrome"
         url: "/p/chrome/g/tryserver.chrome/builders"
         alt: "Chrome"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
-      >
-      links: <
+      }
+      links {
         text: "linux"
         url: "/p/chromium/g/tryserver.chromium.linux/builders"
         alt: "Linux"
-      >
-      links: <
+      }
+      links {
         text: "mac"
         url: "/p/chromium/g/tryserver.chromium.mac/builders"
         alt: "Mac"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/tryserver.chromium.swangle/builders"
         alt: "SWANGLE"
-      >
-      links: <
+      }
+      links {
         text: "win"
         url: "/p/chromium/g/tryserver.chromium.win/builders"
         alt: "Win"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Navigate"
-      links: <
+      links {
         text: "about"
         url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
         alt: "Tour of the console"
-      >
-      links: <
+      }
+      links {
         text: "customize"
         url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
         alt: "Customize this console"
-      >
-    >
-    console_groups: <
-      title: <
+      }
+    }
+    console_groups {
+      title {
         text: "Tree Closers"
         url: "https://chromium-status.appspot.com/"
-      >
+      }
       console_ids: "chromium/chromium"
       console_ids: "chromium/chromium.win"
       console_ids: "chromium/chromium.mac"
@@ -660,326 +7052,813 @@ consoles: <
       console_ids: "chrome/chrome"
       console_ids: "chromium/chromium.memory"
       console_ids: "chromium/chromium.gpu"
-    >
-    console_groups: <
+    }
+    console_groups {
       console_ids: "chromium/chromium.android"
       console_ids: "chrome/chrome.perf"
       console_ids: "chromium/chromium.gpu.fyi"
       console_ids: "chromium/chromium.fuzz"
-    >
+    }
     tree_status_host: "chromium-status.appspot.com"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "chromium.dawn"
   name: "chromium.dawn"
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
+  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 x64 ASAN Release"
+    category: "ToT|Windows|ASAN"
+    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: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
     category: "DEPS|Linux|Intel"
     short_name: "x64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
     category: "DEPS|Linux|Nvidia"
     short_name: "x64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Builder"
     category: "DEPS|Mac|Builder"
     short_name: "x64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Release (AMD)"
     category: "DEPS|Mac|AMD"
     short_name: "x64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Release (Intel)"
     category: "DEPS|Mac|Intel"
     short_name: "x64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Builder"
     category: "DEPS|Windows|Builder"
     short_name: "x86"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Builder"
     category: "DEPS|Windows|Builder"
     short_name: "x64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
     category: "DEPS|Windows|Intel"
     short_name: "x86"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
     category: "DEPS|Windows|Intel"
     short_name: "x64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
     category: "DEPS|Windows|Nvidia"
     short_name: "x86"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
     category: "DEPS|Windows|Nvidia"
     short_name: "x64"
-  >
-  header: <
-    oncalls: <
+  }
+  header {
+    oncalls {
       name: "Chromium"
-      url: "https://rota-ng.appspot.com/legacy/sheriff.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
       name: "Android"
-      url: "https://rota-ng.appspot.com/legacy/sheriff_android.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
       name: "iOS"
       url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "GPU"
       url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Angle"
       url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perf"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perfbot"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Trooper"
       url: "https://rota-ng.appspot.com/legacy/trooper.json"
-    >
-    links: <
+    }
+    links {
       name: "Builds"
-      links: <
+      links {
         text: "continuous"
         url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
         alt: "Continuous browser snapshots"
-      >
-      links: <
+      }
+      links {
         text: "symbols"
         url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
         alt: "Windows Symbols"
-      >
-      links: <
+      }
+      links {
         text: "status"
         url: "https://chromium-status.appspot.com/"
         alt: "Current tree status"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Dashboards"
-      links: <
+      links {
         text: "perf"
         url: "https://chromeperf.appspot.com/"
         alt: "Chrome perf dashboard"
-      >
-      links: <
+      }
+      links {
         text: "flake-portal"
         url: "https://analysis.chromium.org/p/chromium/flake-portal"
         alt: "New flake portal"
-      >
-      links: <
+      }
+      links {
         text: "legacy-flakiness"
         url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
         alt: "Legacy flakiness dashboard"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Chromium"
-      links: <
+      links {
         text: "source"
         url: "https://chromium.googlesource.com/chromium/src"
         alt: "Chromium source code repository"
-      >
-      links: <
+      }
+      links {
         text: "reviews"
         url: "https://chromium-review.googlesource.com"
         alt: "Chromium code review tool"
-      >
-      links: <
+      }
+      links {
         text: "bugs"
         url: "https://crbug.com"
         alt: "Chromium bug tracker"
-      >
-      links: <
+      }
+      links {
         text: "coverage"
         url: "https://analysis.chromium.org/p/chromium/coverage"
         alt: "Chromium code coverage dashboard"
-      >
-      links: <
+      }
+      links {
         text: "dev"
         url: "https://dev.chromium.org/Home"
         alt: "Chromium developer home page"
-      >
-      links: <
+      }
+      links {
         text: "support"
         url: "https://support.google.com/chrome/#topic=7438008"
         alt: "Google Chrome help center"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/chromium.android"
         alt: "Chromium Android console"
-      >
-      links: <
+      }
+      links {
         text: "clang"
         url: "/p/chromium/g/chromium.clang"
         alt: "Chromium Clang console"
-      >
-      links: <
+      }
+      links {
         text: "dawn"
         url: "/p/chromium/g/chromium.dawn"
         alt: "Chromium Dawn console"
-      >
-      links: <
+      }
+      links {
         text: "fuzz"
         url: "/p/chromium/g/chromium.fuzz"
         alt: "Chromium Fuzz console"
-      >
-      links: <
+      }
+      links {
         text: "fyi"
         url: "/p/chromium/g/chromium.fyi"
         alt: "Chromium FYI console"
-      >
-      links: <
+      }
+      links {
         text: "gpu"
         url: "/p/chromium/g/chromium.gpu"
         alt: "Chromium GPU console"
-      >
-      links: <
+      }
+      links {
         text: "perf"
         url: "/p/chrome/g/chrome.perf/console"
         alt: "Chromium Perf console"
-      >
-      links: <
+      }
+      links {
         text: "perf.fyi"
         url: "/p/chrome/g/chrome.perf.fyi/console"
         alt: "Chromium Perf FYI console"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/chromium.swangle"
         alt: "Chromium SWANGLE console"
-      >
-      links: <
+      }
+      links {
         text: "webrtc"
         url: "/p/chromium/g/chromium.webrtc"
         alt: "Chromium WebRTC console"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/chromium.chromiumos"
         alt: "ChromiumOS console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Branch Consoles"
-      links: <
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
         text: "m83"
         url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "chromium.fuzz"
+  name: "chromium.fuzz"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/Afl Upload Linux ASan"
+    category: "afl"
+    short_name: "afl"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win ASan Release"
+    category: "win asan"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win ASan Release Media"
+    category: "win asan"
+    short_name: "med"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac ASAN Release"
+    category: "mac asan"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac ASAN Release Media"
+    category: "mac asan"
+    short_name: "med"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ChromiumOS ASAN Release"
+    category: "cros asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASAN Debug"
+    category: "linux asan"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASAN Release"
+    category: "linux asan"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASAN Release Media"
+    category: "linux asan"
+    short_name: "med"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASan Debug (32-bit x86 with V8-ARM)"
+    category: "linux asan|x64 v8-ARM"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASan Release (32-bit x86 with V8-ARM)"
+    category: "linux asan|x64 v8-ARM"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASan Release Media (32-bit x86 with V8-ARM)"
+    category: "linux asan|x64 v8-ARM"
+    short_name: "med"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Chrome OS ASan"
+    category: "libfuzz"
+    short_name: "chromeos-asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux32 ASan"
+    category: "libfuzz"
+    short_name: "linux32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux32 ASan Debug"
+    category: "libfuzz"
+    short_name: "linux32-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux ASan"
+    category: "libfuzz"
+    short_name: "linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux ASan Debug"
+    category: "libfuzz"
+    short_name: "linux-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux MSan"
+    category: "libfuzz"
+    short_name: "linux-msan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux UBSan"
+    category: "libfuzz"
+    short_name: "linux-ubsan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Mac ASan"
+    category: "libfuzz"
+    short_name: "mac-asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Windows ASan"
+    category: "libfuzz"
+    short_name: "win-asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux32 V8-ARM ASan"
+    category: "libfuzz"
+    short_name: "arm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux32 V8-ARM ASan Debug"
+    category: "libfuzz"
+    short_name: "arm-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux V8-ARM64 ASan"
+    category: "libfuzz"
+    short_name: "arm64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux V8-ARM64 ASan Debug"
+    category: "libfuzz"
+    short_name: "arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/MSAN Release (chained origins)"
+    category: "linux msan"
+    short_name: "org"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/MSAN Release (no origins)"
+    category: "linux msan"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/TSAN Debug"
+    category: "linux tsan"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/TSAN Release"
+    category: "linux tsan"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/UBSan Release"
+    category: "linux UBSan"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/UBSan vptr Release"
+    category: "linux UBSan"
+    short_name: "vpt"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
         alt: "Beta branch console"
-      >
-      links: <
-        text: "m81"
-        url: "/p/chromium/g/main-m81/console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
         alt: "Stable branch console"
-      >
-      links: <
+      }
+      links {
         text: "trunk"
         url: "/p/chromium/g/main/console"
         alt: "Trunk (ToT) console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Tryservers"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/tryserver.chromium.android/builders"
         alt: "Android"
-      >
-      links: <
+      }
+      links {
         text: "angle"
         url: "/p/chromium/g/tryserver.chromium.angle/builders"
         alt: "Angle"
-      >
-      links: <
+      }
+      links {
         text: "blink"
         url: "/p/chromium/g/tryserver.blink/builders"
         alt: "Blink"
-      >
-      links: <
+      }
+      links {
         text: "chrome"
         url: "/p/chrome/g/tryserver.chrome/builders"
         alt: "Chrome"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
-      >
-      links: <
+      }
+      links {
         text: "linux"
         url: "/p/chromium/g/tryserver.chromium.linux/builders"
         alt: "Linux"
-      >
-      links: <
+      }
+      links {
         text: "mac"
         url: "/p/chromium/g/tryserver.chromium.mac/builders"
         alt: "Mac"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/tryserver.chromium.swangle/builders"
         alt: "SWANGLE"
-      >
-      links: <
+      }
+      links {
         text: "win"
         url: "/p/chromium/g/tryserver.chromium.win/builders"
         alt: "Win"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Navigate"
-      links: <
+      links {
         text: "about"
         url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
         alt: "Tour of the console"
-      >
-      links: <
+      }
+      links {
         text: "customize"
         url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
         alt: "Customize this console"
-      >
-    >
-    console_groups: <
-      title: <
+      }
+    }
+    console_groups {
+      title {
         text: "Tree Closers"
         url: "https://chromium-status.appspot.com/"
-      >
+      }
       console_ids: "chromium/chromium"
       console_ids: "chromium/chromium.win"
       console_ids: "chromium/chromium.mac"
@@ -988,302 +7867,2774 @@ consoles: <
       console_ids: "chrome/chrome"
       console_ids: "chromium/chromium.memory"
       console_ids: "chromium/chromium.gpu"
-    >
-    console_groups: <
+    }
+    console_groups {
       console_ids: "chromium/chromium.android"
       console_ids: "chrome/chrome.perf"
       console_ids: "chromium/chromium.gpu.fyi"
       console_ids: "chromium/chromium.fuzz"
-    >
+    }
     tree_status_host: "chromium-status.appspot.com"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "chromium.fyi"
   name: "chromium.fyi"
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
+  builders {
+    name: "buildbucket/luci.chromium.ci/Closure Compilation Linux"
+    category: "closure_compilation"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-code-coverage"
+    category: "code_coverage"
+    short_name: "and"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-code-coverage-native"
+    category: "code_coverage"
+    short_name: "ann"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-code-coverage"
+    category: "code_coverage"
+    short_name: "lnx"
+  }
+  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"
+    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/win10-code-coverage"
+    category: "code_coverage"
+    short_name: "win"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/ios-simulator-cronet"
     category: "cronet"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac Builder Next"
+    category: "mac"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.15 Tests"
+    category: "mac"
+    short_name: "15"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-hermetic-upgrade-rel"
+    category: "mac"
+    short_name: "herm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-arm64"
+    category: "mac"
+    short_name: "arm64"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/mac-osxbeta-rel"
     category: "mac"
     short_name: "beta"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/chromeos-kevin-rel-hw-tests"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac deterministic"
+    category: "deterministic|mac"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac deterministic (dbg)"
+    category: "deterministic|mac"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-official"
+    category: "fuchsia"
+    short_name: "off"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-fyi-arm64-rel"
+    category: "fuchsia|a64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-fyi-x64-dbg"
+    category: "fuchsia|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-fyi-x64-rel"
+    category: "fuchsia|x64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-lacros-rel"
     category: "chromeos"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-asan"
+    category: "iOS"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-cr-recipe"
+    category: "iOS"
+    short_name: "chr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-multi-window"
+    category: "iOS"
+    short_name: "mwd"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-webkit-tot"
+    category: "iOS"
+    short_name: "wk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios13-sdk-device"
+    category: "iOS|iOS13"
+    short_name: "dev"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios13-beta-simulator"
+    category: "iOS|iOS13"
+    short_name: "ios13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios13-sdk-simulator"
+    category: "iOS|iOS13"
+    short_name: "sdk13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios14-beta-simulator"
+    category: "iOS|iOS14"
+    short_name: "ios14"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios14-sdk-simulator"
+    category: "iOS|iOS14"
+    short_name: "sdk14"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/VR Linux"
     category: "linux"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-bfcache-rel"
+    category: "linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-fieldtrial-rel"
+    category: "linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-perfetto-rel"
+    category: "linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-wpt-fyi-rel"
+    category: "linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Leak Detection Linux"
+    category: "linux"
+    short_name: "lk"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (Headless)"
     category: "linux"
     short_name: "loh"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (Wayland)"
     category: "linux"
     short_name: "low"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (X11)"
     category: "linux"
     short_name: "lox"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-official"
+    category: "linux"
+    short_name: "off"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-blink-animation-use-time-delta"
+    category: "linux|blink"
+    short_name: "TD"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-blink-heap-concurrent-marking-tsan-rel"
+    category: "linux|blink"
+    short_name: "CM"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-blink-heap-verification"
+    category: "linux|blink"
+    short_name: "VF"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mojo Android"
+    category: "mojo"
+    short_name: "and"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-mojo-webview-rel"
+    category: "mojo"
+    short_name: "aw"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mojo ChromiumOS"
+    category: "mojo"
+    short_name: "cr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mojo Linux"
+    category: "mojo"
+    short_name: "lnx"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-mojo-rel"
+    category: "mojo"
+    short_name: "mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mojo Windows"
+    category: "mojo"
+    short_name: "win"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-chromium-tests-staging-builder"
+    category: "recipe|staging|linux"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-chromium-tests-staging-tests"
+    category: "recipe|staging|linux"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux remote_run Builder"
+    category: "remote_run"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux remote_run Tester"
+    category: "remote_run"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Site Isolation Android"
+    category: "site_isolation"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-annotator-rel"
+    category: "network|traffic|annotations"
+    short_name: "lnx"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-annotator-rel"
+    category: "network|traffic|annotations"
+    short_name: "win"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Viz"
+    category: "viz"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win 10 Fast Ring"
+    category: "win10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-pixel-builder-rel"
+    category: "win10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-pixel-tester-rel"
+    category: "win10"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Win10 Tests x64 1803"
     category: "win10|1803"
-  >
-  header: <
-    oncalls: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win32-arm64-rel"
+    category: "win32|arm64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-official"
+    category: "android"
+    short_name: "off"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-celab-builder-rel"
+    category: "celab"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-celab-tester-rel"
+    category: "celab"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-upload-perfetto"
+    category: "perfetto"
+    short_name: "lnx"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-upload-perfetto"
+    category: "perfetto"
+    short_name: "mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-upload-perfetto"
+    category: "perfetto"
+    short_name: "win"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "chromium.goma"
+  name: "chromium.goma"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma Staging"
+    category: "clients5"
+    short_name: "lnx"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Mac Goma Staging"
+    category: "clients5"
+    short_name: "mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/CrWinGomaStaging"
+    category: "clients5"
+    short_name: "win"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma RBE ToT"
+    category: "rbe|tot|linux|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma RBE ToT (ATS)"
+    category: "rbe|tot|linux|rel"
+    short_name: "ats"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Mac Goma RBE ToT"
+    category: "rbe|tot|mac|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Win Goma RBE ToT"
+    category: "rbe|tot|win|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium iOS Goma RBE ToT"
+    category: "rbe|tot|ios|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Android ARM 32-bit Goma RBE ToT"
+    category: "rbe|tot|android arm|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Android ARM 32-bit Goma RBE ToT (ATS)"
+    category: "rbe|tot|android arm|rel"
+    short_name: "ats"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma RBE Staging (clobber)"
+    category: "rbe|staging|linux|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma RBE Staging"
+    category: "rbe|staging|linux|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma RBE Staging (dbg) (clobber)"
+    category: "rbe|staging|linux|debug"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma RBE Staging (dbg)"
+    category: "rbe|staging|linux|debug"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Mac Goma RBE Staging (clobber)"
+    category: "rbe|staging|mac|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Mac Goma RBE Staging"
+    category: "rbe|staging|mac|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Mac Goma RBE Staging (dbg)"
+    category: "rbe|staging|mac|debug"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Win Goma RBE Staging"
+    category: "rbe|staging|win|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Win Goma RBE Staging (clobber)"
+    category: "rbe|staging|win|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Android ARM 32-bit Goma RBE Staging"
+    category: "rbe|staging|android arm|rel"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+  include_experimental_builds: true
+}
+consoles {
+  id: "chromium.goma.fyi"
+  name: "chromium.goma.fyi"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.goma/Win Builder Goma Canary"
+    category: "win|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Win Builder (dbg) Goma Canary"
+    category: "win|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/win32-archive-rel-goma-canary-localoutputcache"
+    category: "win|rel"
+    short_name: "loc"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Win7 Builder Goma Canary"
+    category: "win7|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Win7 Builder (dbg) Goma Canary"
+    category: "win7|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Mac Builder Goma Canary"
+    category: "mac|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Mac Builder (dbg) Goma Canary"
+    category: "mac|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/mac-archive-rel-goma-canary"
+    category: "mac|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Mac Builder (dbg) Goma Canary (clobber)"
+    category: "mac|dbg"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/mac-archive-rel-goma-canary-localoutputcache"
+    category: "mac|rel"
+    short_name: "loc"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/chromeos-amd64-generic-rel-goma-canary"
+    category: "cros|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Linux Builder Goma Canary"
+    category: "linux|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/linux-archive-rel-goma-canary"
+    category: "linux|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/linux-archive-rel-goma-canary-localoutputcache"
+    category: "linux|rel"
+    short_name: "loc"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/android-archive-dbg-goma-canary"
+    category: "android|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/ios-device-goma-canary-clobber"
+    category: "ios|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/linux-archive-rel-goma-rbe-canary"
+    category: "rbe|linux|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/linux-archive-rel-goma-rbe-ats-canary"
+    category: "rbe|linux|rel"
+    short_name: "ats"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Linux Builder Goma RBE Canary"
+    category: "rbe|linux|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/chromeos-amd64-generic-rel-goma-rbe-canary"
+    category: "rbe|cros|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/android-archive-dbg-goma-rbe-canary"
+    category: "rbe|android|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/android-archive-dbg-goma-rbe-ats-canary"
+    category: "rbe|android|dbg"
+    short_name: "ats"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/mac-archive-rel-goma-rbe-canary"
+    category: "rbe|mac|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Mac Builder (dbg) Goma RBE Canary (clobber)"
+    category: "rbe|mac|dbg"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/ios-device-goma-rbe-canary-clobber"
+    category: "rbe|ios"
+    short_name: "clb"
+  }
+  header {
+    oncalls {
       name: "Chromium"
-      url: "https://rota-ng.appspot.com/legacy/sheriff.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
       name: "Android"
-      url: "https://rota-ng.appspot.com/legacy/sheriff_android.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
       name: "iOS"
       url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "GPU"
       url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Angle"
       url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perf"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perfbot"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Trooper"
       url: "https://rota-ng.appspot.com/legacy/trooper.json"
-    >
-    links: <
+    }
+    links {
       name: "Builds"
-      links: <
+      links {
         text: "continuous"
         url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
         alt: "Continuous browser snapshots"
-      >
-      links: <
+      }
+      links {
         text: "symbols"
         url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
         alt: "Windows Symbols"
-      >
-      links: <
+      }
+      links {
         text: "status"
         url: "https://chromium-status.appspot.com/"
         alt: "Current tree status"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Dashboards"
-      links: <
+      links {
         text: "perf"
         url: "https://chromeperf.appspot.com/"
         alt: "Chrome perf dashboard"
-      >
-      links: <
+      }
+      links {
         text: "flake-portal"
         url: "https://analysis.chromium.org/p/chromium/flake-portal"
         alt: "New flake portal"
-      >
-      links: <
+      }
+      links {
         text: "legacy-flakiness"
         url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
         alt: "Legacy flakiness dashboard"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Chromium"
-      links: <
+      links {
         text: "source"
         url: "https://chromium.googlesource.com/chromium/src"
         alt: "Chromium source code repository"
-      >
-      links: <
+      }
+      links {
         text: "reviews"
         url: "https://chromium-review.googlesource.com"
         alt: "Chromium code review tool"
-      >
-      links: <
+      }
+      links {
         text: "bugs"
         url: "https://crbug.com"
         alt: "Chromium bug tracker"
-      >
-      links: <
+      }
+      links {
         text: "coverage"
         url: "https://analysis.chromium.org/p/chromium/coverage"
         alt: "Chromium code coverage dashboard"
-      >
-      links: <
+      }
+      links {
         text: "dev"
         url: "https://dev.chromium.org/Home"
         alt: "Chromium developer home page"
-      >
-      links: <
+      }
+      links {
         text: "support"
         url: "https://support.google.com/chrome/#topic=7438008"
         alt: "Google Chrome help center"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/chromium.android"
         alt: "Chromium Android console"
-      >
-      links: <
+      }
+      links {
         text: "clang"
         url: "/p/chromium/g/chromium.clang"
         alt: "Chromium Clang console"
-      >
-      links: <
+      }
+      links {
         text: "dawn"
         url: "/p/chromium/g/chromium.dawn"
         alt: "Chromium Dawn console"
-      >
-      links: <
+      }
+      links {
         text: "fuzz"
         url: "/p/chromium/g/chromium.fuzz"
         alt: "Chromium Fuzz console"
-      >
-      links: <
+      }
+      links {
         text: "fyi"
         url: "/p/chromium/g/chromium.fyi"
         alt: "Chromium FYI console"
-      >
-      links: <
+      }
+      links {
         text: "gpu"
         url: "/p/chromium/g/chromium.gpu"
         alt: "Chromium GPU console"
-      >
-      links: <
+      }
+      links {
         text: "perf"
         url: "/p/chrome/g/chrome.perf/console"
         alt: "Chromium Perf console"
-      >
-      links: <
+      }
+      links {
         text: "perf.fyi"
         url: "/p/chrome/g/chrome.perf.fyi/console"
         alt: "Chromium Perf FYI console"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/chromium.swangle"
         alt: "Chromium SWANGLE console"
-      >
-      links: <
+      }
+      links {
         text: "webrtc"
         url: "/p/chromium/g/chromium.webrtc"
         alt: "Chromium WebRTC console"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/chromium.chromiumos"
         alt: "ChromiumOS console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Branch Consoles"
-      links: <
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
         text: "m83"
         url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+  include_experimental_builds: true
+}
+consoles {
+  id: "chromium.goma.migration"
+  name: "chromium.goma.migration"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/VR Linux"
+    category: "week1|linux"
+    short_name: "vr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mojo Linux"
+    category: "week1|linux"
+    short_name: "mojo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)"
+    category: "week1|linux|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)(32)"
+    category: "week1|linux|dbg"
+    short_name: "32bit"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux CFI"
+    category: "week1|linux|cfi"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux MSan Builder"
+    category: "week1|linux"
+    short_name: "msan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Afl Upload Linux ASan"
+    category: "week1|linux"
+    short_name: "afl-asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/WebKit Linux ASAN"
+    category: "week1|linux|webkit"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/WebKit Linux Leak"
+    category: "week1|linux|webkit"
+    short_name: "leak"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/WebKit Linux MSAN"
+    category: "week1|linux|webkit"
+    short_name: "msan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 32 Vk Release (Pixel 2)"
+    category: "week2a|android|32"
+    short_name: "p2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 32 dEQP Vk Release (Pixel 2)"
+    category: "week2a|android|32deqp"
+    short_name: "p2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 64 Vk Release (Pixel 2)"
+    category: "week2a|android|64"
+    short_name: "p2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 64 dEQP Vk Release (Pixel 2)"
+    category: "week2a|android|64deqp"
+    short_name: "p2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (NVIDIA Shield TV)"
+    category: "week2a|android|rel"
+    short_name: "shdtv"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 5)"
+    category: "week2a|android|rel"
+    short_name: "n5"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 5X)"
+    category: "week2a|android|rel"
+    short_name: "n5x"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 6)"
+    category: "week2a|android|rel"
+    short_name: "n6"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 6P)"
+    category: "week2a|android|rel"
+    short_name: "n6p"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 9)"
+    category: "week2a|android|rel"
+    short_name: "n9"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Pixel 2)"
+    category: "week2a|android|rel"
+    short_name: "p2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI dEQP Release (Nexus 5X)"
+    category: "week2a|android|deqp"
+    short_name: "n5x"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Android"
+    category: "week2a|android|det"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Android (dbg)"
+    category: "week2a|android|det"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder"
+    category: "week2b|android|release"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder (dbg)"
+    category: "week2b|android|debug|builder"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder ARM64 (dbg)"
+    category: "week2b|android|debug|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Linux Builder"
+    category: "week2b|linux|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Linux Builder (dbg)"
+    category: "week2b|linux|debug"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Mac Builder"
+    category: "week2b|mac|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Mac Builder (dbg)"
+    category: "week2b|mac|debug"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Android Builder"
+    category: "week2b|android"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Linux Builder"
+    category: "week2b|linux"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Mac Builder"
+    category: "week2b|mac"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac ASAN Release"
+    category: "week2c|mac|asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac ASAN Release Media"
+    category: "week2c|mac|asan"
+    short_name: "media"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac ASan 64 Builder"
+    category: "week2c|mac|asan"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Mac ASan"
+    category: "week2c|mac|asan"
+    short_name: "fuzz"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/WebKit Mac10.13 (retina)"
+    category: "week2c|mac"
+    short_name: "webkit"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android CFI"
+    category: "week2c|android"
+    short_name: "cfi"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Site Isolation Android"
+    category: "week2c|android"
+    short_name: "isolate"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mojo Android"
+    category: "week2c|android"
+    short_name: "mojo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android x64 Builder (dbg)"
+    category: "week2c|android|dbg"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android x86 Builder (dbg)"
+    category: "week2c|android|dbg"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView L (dbg)"
+    category: "week2c|android|dbg|webview"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView M (dbg)"
+    category: "week2c|android|dbg|webview"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView N (dbg)"
+    category: "week2c|android|dbg|webview"
+    short_name: "n"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView O (dbg)"
+    category: "week2c|android|dbg|webview"
+    short_name: "o"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView P FYI (rel)"
+    category: "week2c|android|rel|webview"
+    short_name: "p"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 Builder"
+    category: "week2d|linux|dawn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Builder"
+    category: "week2d|linux|dawn"
+    short_name: "deps"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux Builder"
+    category: "week2d|linux|gpu|fyi"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux Builder (dbg)"
+    category: "week2d|linux|gpu|fyi"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux Ozone Builder"
+    category: "week2d|linux|gpu|fyi"
+    short_name: "ozone"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux dEQP Builder"
+    category: "week2d|linux|gpu|fyi"
+    short_name: "deqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI GPU TSAN Release"
+    category: "week2d|linux|gpu|fyi"
+    short_name: "tsan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Linux Builder (dbg)"
+    category: "week2d|linux|gpu"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Viz"
+    category: "week2d|linux"
+    short_name: "viz"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux remote_run Builder"
+    category: "week2d|linux"
+    short_name: "rem"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Closure Compilation Linux"
+    category: "week2d|linux"
+    short_name: "clsr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux"
+    category: "week2d|linux|det"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux (dbg)"
+    category: "week2d|linux|det"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 Builder"
+    category: "week2d|mac|dawn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Builder"
+    category: "week2d|mac|dawn"
+    short_name: "deps"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Mac Builder"
+    category: "week2d|mac|gpu|fyi"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Mac Builder (dbg)"
+    category: "week2d|mac|gpu|fyi"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Mac dEQP Builder"
+    category: "week2d|mac|gpu|fyi"
+    short_name: "deqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac FYI GPU ASAN Release"
+    category: "week2d|mac|gpu|fyi"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Mac Builder (dbg)"
+    category: "week2d|mac|gpu"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac deterministic"
+    category: "week2d|mac|det"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac deterministic (dbg)"
+    category: "week2d|mac|det"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Builder"
+    category: "week2.5|linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Linux Builder"
+    category: "week2.5|linux"
+    short_name: "gpu"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-ozone-rel"
+    category: "week3a|linux"
+    short_name: "ozone"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-annotator-rel"
+    category: "week3a|linux"
+    short_name: "anno"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux_chromium_component_updater"
+    category: "week3a|linux"
+    short_name: "cc_upd"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-code-coverage"
+    category: "week3a|linux"
+    short_name: "code"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-blink-animation-use-time-delta"
+    category: "week3a|linux|blink"
+    short_name: "anim"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-blink-heap-concurrent-marking-tsan-rel"
+    category: "week3a|linux|blink"
+    short_name: "tsan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-blink-heap-verification"
+    category: "week3a|linux|blink"
+    short_name: "ver"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-chromium-tests-staging-builder"
+    category: "week3a|linux"
+    short_name: "crtests"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-arm-dbg"
+    category: "week3b|android|cronet|arm"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-arm-rel"
+    category: "week3b|android|cronet|arm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-asan-arm-rel"
+    category: "week3b|android|cronet|arm"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-kitkat-arm-rel"
+    category: "week3b|android|cronet|arm"
+    short_name: "kkat"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-lollipop-arm-rel"
+    category: "week3b|android|cronet|arm"
+    short_name: "lpop"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-arm64-rel"
+    category: "week3b|android|cronet|arm64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-arm64-dbg"
+    category: "week3b|android|cronet|arm64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-marshmallow-arm64-rel"
+    category: "week3b|android|cronet|arm64"
+    short_name: "marsh"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-marshmallow-arm64-perf-rel"
+    category: "week3b|android|cronet|arm64"
+    short_name: "perf"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-x86-rel"
+    category: "week3b|android|cronet|x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-cronet-x86-dbg"
+    category: "week3b|android|cronet|x86"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-incremental-dbg"
+    category: "week3b|android"
+    short_name: "inc"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-mojo-webview-rel"
+    category: "week3b|android"
+    short_name: "mojo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-pie-arm64-dbg"
+    category: "week3b|linux"
+    short_name: "pie"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-code-coverage"
+    category: "week3c|mac"
+    short_name: "code"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-hermetic-upgrade-rel"
+    category: "week3c|mac"
+    short_name: "herm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-mojo-rel"
+    category: "week3c|mac"
+    short_name: "mojo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-osxbeta-rel"
+    category: "week3c|mac"
+    short_name: "osx"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac Builder"
+    category: "week3c|mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
+    category: "week3c|mac"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Mac Builder"
+    category: "week3c|mac"
+    short_name: "gpu"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux ASan"
+    category: "week4|linux"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux ASan Debug"
+    category: "week4|linux"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux MSan"
+    category: "week4|linux"
+    short_name: "msan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux UBSan"
+    category: "week4|linux"
+    short_name: "ubsan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux V8-ARM64 ASan"
+    category: "week4|linux|v8arm"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux V8-ARM64 ASan Debug"
+    category: "week4|linux|v8arm"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux32 ASan"
+    category: "week4|linux32"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux32 ASan Debug"
+    category: "week4|linux32"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux32 V8-ARM ASan"
+    category: "week4|linux32|v8arm"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux32 V8-ARM ASan Debug"
+    category: "week4|linux32|v8arm"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASan Debug (32-bit x86 with V8-ARM)"
+    category: "week5|asan"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASan Release (32-bit x86 with V8-ARM)"
+    category: "week5|asan"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASan Release Media (32-bit x86 with V8-ARM)"
+    category: "week5|asan"
+    short_name: "media"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASAN Debug"
+    category: "week6|asan"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASAN Release"
+    category: "week6|asan"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ASAN Release Media"
+    category: "week6|asan"
+    short_name: "media"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/MSAN Release (chained origins)"
+    category: "week7|msan"
+    short_name: "chain"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/MSAN Release (no origins)"
+    category: "week7|msan"
+    short_name: "none"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/TSAN Release"
+    category: "week8|tsan"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/TSAN Debug"
+    category: "week8|tsan"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/UBSan Release"
+    category: "week9|ubsan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/UBSan vptr Release"
+    category: "week9|ubsan|vptr"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/UBSanVptr Linux"
+    category: "week9|ubsan|vptr"
+    short_name: "lnx"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Cast Android (dbg)"
+    category: "week10|android"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Cast Audio Linux"
+    category: "week10|linux"
+    short_name: "audio"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Cast Linux"
+    category: "week10|linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Fuchsia ARM64"
+    category: "week11|fuchsia|arm64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-arm64-cast"
+    category: "week11|fuchsia|arm64"
+    short_name: "cast"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Fuchsia x64"
+    category: "week11|fuchsia|x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-x64-cast"
+    category: "week11|fuchsia|x64"
+    short_name: "cast"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-fyi-arm64-rel"
+    category: "week11|fuchsia|fyi"
+    short_name: "arm64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-fyi-x64-dbg"
+    category: "week11|fuchsia|fyi"
+    short_name: "x64 dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-fyi-x64-rel"
+    category: "week11|fuchsia|fyi"
+    short_name: "x64 rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-marshmallow-arm64-rel"
+    category: "week13|android"
+    short_name: "marsh"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android Release (Nexus 5X)"
+    category: "week13|android"
+    short_name: "n5x"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Builder"
+    category: "week14a|linux"
+    short_name: "asanlsan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux TSan Builder"
+    category: "week14a|linux"
+    short_name: "tsan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android ASAN (dbg)"
+    category: "week14b|android"
+    short_name: "asanlsan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android arm Builder (dbg)"
+    category: "week14b|android"
+    short_name: "tsan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android arm64 Builder (dbg)"
+    category: "week14b|android"
+    short_name: "tsan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-x64-dbg"
+    category: "week15a|fuchsia"
+    short_name: "x64dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-archive-dbg"
+    category: "week15a|linux|archive"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-archive-rel"
+    category: "week15a|linux|archive"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-bfcache-rel"
+    category: "week15a|linux"
+    short_name: "bfc"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-blink-cors-rel"
+    category: "week15a|linux"
+    short_name: "oorcors"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-fieldtrial-rel"
+    category: "week15a|linux"
+    short_name: "field"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView P Blink-CORS FYI (rel)"
+    category: "week15b|android|webview p"
+    short_name: "oorcors"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-archive-rel"
+    category: "week15b|android|archive"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-archive-dbg"
+    category: "week15b|android|archive"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-asan"
+    category: "week15b|android"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-bfcache-rel"
+    category: "week15b|android"
+    short_name: "bfc"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-code-coverage"
+    category: "week15b|android"
+    short_name: "code"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-pie-arm64-rel"
+    category: "week15b|android|pie"
+    short_name: "arm64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-pie-x86-rel"
+    category: "week15b|android|pie"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Perf Android 64 Builder"
+    category: "week15b|android|gpu"
+    short_name: "perf64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-archive-rel"
+    category: "week15b|mac|archive"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-archive-dbg"
+    category: "week15b|mac|archive"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-marshmallow-x86-fyi-rel"
+    category: "week16b"
+    short_name: "marsh"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 64 Perf (Pixel 2)"
+    category: "week16b"
+    short_name: "pxl2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-swangle-tot-angle-x64"
+    category: "week17|swangle|angle"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-swangle-tot-angle-x86"
+    category: "week17|swangle|angle"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-swangle-tot-swiftshader-x64"
+    category: "week17|swangle|swift"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-swangle-tot-swiftshader-x86"
+    category: "week17|swangle|swift"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-swangle-x64"
+    category: "week17|swangle"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-swangle-x86"
+    category: "week17|swangle"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-code-coverage-native"
+    category: "misc|android"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win ASan Release"
+    category: "win|week1|asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win ASan Release Media"
+    category: "win|week1|asan"
+    short_name: "media"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win10-code-coverage"
+    category: "win|week1.1"
+    short_name: "code"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win x64 Builder (dbg)"
+    category: "win|week1.5"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-archive-dbg"
+    category: "win|week1.5|archive"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-archive-rel"
+    category: "win|week1.5|archive"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 Builder"
+    category: "win|week2|dawn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Builder"
+    category: "win|week2|dawn"
+    short_name: "deps"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Win x64 Builder (dbg)"
+    category: "win|week2|gpu"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI XR Win x64 Builder"
+    category: "win|week2|gpu|fyi"
+    short_name: "xr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 dEQP Builder"
+    category: "win|week2|gpu|fyi"
+    short_name: "deqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 DX12 Vulkan Builder"
+    category: "win|week2|gpu|fyi|dx12"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 DX12 Vulkan Builder (dbg)"
+    category: "win|week2|gpu|fyi|dx12"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 Builder"
+    category: "win|week2|gpu|fyi"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 Builder (dbg)"
+    category: "win|week2|gpu|fyi"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win Builder"
+    category: "win|week3"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win Builder (dbg)"
+    category: "win|week3"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win Builder"
+    category: "win|week3|gpu|fyi"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win Builder (dbg)"
+    category: "win|week3|gpu|fyi"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win dEQP Builder"
+    category: "win|week3|gpu|fyi"
+    short_name: "deqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 Builder"
+    category: "win|week3|dawn"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Builder"
+    category: "win|week3|dawn"
+    short_name: "deps"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win32-archive-rel"
+    category: "win|week4|win32"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win32-archive-dbg"
+    category: "win|week4|win32"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win32-arm64-rel"
+    category: "win|week4|win32"
+    short_name: "arm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Windows ASan"
+    category: "win|week4"
+    short_name: "libfuzzer"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Windows deterministic"
+    category: "win|week4"
+    short_name: "det"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mojo Windows"
+    category: "win|week4"
+    short_name: "mojo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-celab-builder-rel"
+    category: "win|week4"
+    short_name: "celab"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-asan"
+    category: "win|week4"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win 10 Fast Ring"
+    category: "win|week4"
+    short_name: "fastring"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-annotator-rel"
+    category: "win|week4"
+    short_name: "anno"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-pixel-builder-rel"
+    category: "win|week4"
+    short_name: "pixel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Win Builder"
+    category: "win|week4|webrtc"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Win Builder"
+    category: "win|week4|webrtc|fyi"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Win Builder (dbg)"
+    category: "win|week4|webrtc|fyi"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-swangle-x86"
+    category: "win|week4|swangle"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-swangle-x64"
+    category: "win|week4|swangle"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-swangle-tot-angle-x86"
+    category: "win|week4|swangle|angle"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-swangle-tot-angle-x64"
+    category: "win|week4|swangle|angle"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-swangle-tot-swiftshader-x86"
+    category: "win|week4|swangle|swift"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-swangle-tot-swiftshader-x64"
+    category: "win|week4|swangle|swift"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win x64 Builder"
+    category: "win|week5"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Win x64 Builder"
+    category: "win|week5"
+    short_name: "gpu"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-chromeos-dbg"
+    category: "cros|week1"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-chromeos-rel"
+    category: "cros|week1"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-chromeos-code-coverage"
+    category: "cros|week1"
+    short_name: "code"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS Full"
+    category: "cros|week2"
+    short_name: "full"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ChromiumOS ASAN Release"
+    category: "cros|week2"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Chromium OS ASan LSan Builder"
+    category: "cros|week2"
+    short_name: "asan lsan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS MSan Builder"
+    category: "cros|week2"
+    short_name: "msan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mojo ChromiumOS"
+    category: "cros|week2"
+    short_name: "mojo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Chrome OS ASan"
+    category: "cros|week2"
+    short_name: "fuzz"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel"
+    category: "cros|week3|amd64"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-dbg"
+    category: "cros|week3|amd64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-asan-rel"
+    category: "cros|week3|amd64"
+    short_name: "asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-cfi-thin-lto-rel"
+    category: "cros|week3|amd64"
+    short_name: "thinlto"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-arm-generic-rel"
+    category: "cros|week3|arm"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-arm-generic-dbg"
+    category: "cros|week3|arm"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/chromeos-kevin-rel"
+    category: "cros|week3|kevin"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI ios-device"
+    category: "ios|week1a"
+    short_name: "dev"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI ios-simulator"
+    category: "ios|week1a"
+    short_name: "sim"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-device"
+    category: "ios|week1b"
+    short_name: "dev"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator"
+    category: "ios|week1b|sim"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-full-configs"
+    category: "ios|week1b|sim"
+    short_name: "fullconf"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-noncq"
+    category: "ios|week1b|sim"
+    short_name: "noncq"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios13-beta-simulator"
+    category: "ios|week1b|ios13|beta"
+    short_name: "sim"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios13-sdk-simulator"
+    category: "ios|week1b|ios13|sdk"
+    short_name: "sim"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-cronet"
+    category: "ios|week1c"
+    short_name: "cro"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-cr-recipe"
+    category: "ios|week1c"
+    short_name: "crr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-webkit-tot"
+    category: "ios|week1c"
+    short_name: "webkit"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios13-sdk-device"
+    category: "ios|week1c|ios13"
+    short_name: "dev"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-code-coverage"
+    category: "ios|week1d"
+    short_name: "code"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
         alt: "Beta branch console"
-      >
-      links: <
-        text: "m81"
-        url: "/p/chromium/g/main-m81/console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
         alt: "Stable branch console"
-      >
-      links: <
+      }
+      links {
         text: "trunk"
         url: "/p/chromium/g/main/console"
         alt: "Trunk (ToT) console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Tryservers"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/tryserver.chromium.android/builders"
         alt: "Android"
-      >
-      links: <
+      }
+      links {
         text: "angle"
         url: "/p/chromium/g/tryserver.chromium.angle/builders"
         alt: "Angle"
-      >
-      links: <
+      }
+      links {
         text: "blink"
         url: "/p/chromium/g/tryserver.blink/builders"
         alt: "Blink"
-      >
-      links: <
+      }
+      links {
         text: "chrome"
         url: "/p/chrome/g/tryserver.chrome/builders"
         alt: "Chrome"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
-      >
-      links: <
+      }
+      links {
         text: "linux"
         url: "/p/chromium/g/tryserver.chromium.linux/builders"
         alt: "Linux"
-      >
-      links: <
+      }
+      links {
         text: "mac"
         url: "/p/chromium/g/tryserver.chromium.mac/builders"
         alt: "Mac"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/tryserver.chromium.swangle/builders"
         alt: "SWANGLE"
-      >
-      links: <
+      }
+      links {
         text: "win"
         url: "/p/chromium/g/tryserver.chromium.win/builders"
         alt: "Win"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Navigate"
-      links: <
+      links {
         text: "about"
         url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
         alt: "Tour of the console"
-      >
-      links: <
+      }
+      links {
         text: "customize"
         url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
         alt: "Customize this console"
-      >
-    >
-    console_groups: <
-      title: <
+      }
+    }
+    console_groups {
+      title {
         text: "Tree Closers"
         url: "https://chromium-status.appspot.com/"
-      >
+      }
       console_ids: "chromium/chromium"
       console_ids: "chromium/chromium.win"
       console_ids: "chromium/chromium.mac"
@@ -1292,298 +10643,1010 @@ consoles: <
       console_ids: "chrome/chrome"
       console_ids: "chromium/chromium.memory"
       console_ids: "chromium/chromium.gpu"
-    >
-    console_groups: <
+    }
+    console_groups {
       console_ids: "chromium/chromium.android"
       console_ids: "chrome/chrome.perf"
       console_ids: "chromium/chromium.gpu.fyi"
       console_ids: "chromium/chromium.fuzz"
-    >
+    }
     tree_status_host: "chromium-status.appspot.com"
-  >
->
-consoles: <
+  }
+  include_experimental_builds: true
+}
+consoles {
   id: "chromium.gpu"
   name: "chromium.gpu"
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
+  builders {
     name: "buildbucket/luci.chromium.ci/GPU Win x64 Builder"
     category: "Windows"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Win x64 Builder (dbg)"
+    category: "Windows"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 x64 Debug (NVIDIA)"
+    category: "Windows"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Win10 x64 Release (NVIDIA)"
     category: "Windows"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/GPU Mac Builder"
     category: "Mac"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Mac Builder (dbg)"
+    category: "Mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac Debug (Intel)"
+    category: "Mac"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Mac Release (Intel)"
     category: "Mac"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac Retina Debug (AMD)"
+    category: "Mac"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Mac Retina Release (AMD)"
     category: "Mac"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/GPU Linux Builder"
     category: "Linux"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU Linux Builder (dbg)"
+    category: "Linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Debug (NVIDIA)"
+    category: "Linux"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux Release (NVIDIA)"
     category: "Linux"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Android Release (Nexus 5X)"
     category: "Android"
-  >
-  header: <
-    oncalls: <
+  }
+  header {
+    oncalls {
       name: "Chromium"
-      url: "https://rota-ng.appspot.com/legacy/sheriff.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
       name: "Android"
-      url: "https://rota-ng.appspot.com/legacy/sheriff_android.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
       name: "iOS"
       url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "GPU"
       url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Angle"
       url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perf"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perfbot"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Trooper"
       url: "https://rota-ng.appspot.com/legacy/trooper.json"
-    >
-    links: <
+    }
+    links {
       name: "Builds"
-      links: <
+      links {
         text: "continuous"
         url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
         alt: "Continuous browser snapshots"
-      >
-      links: <
+      }
+      links {
         text: "symbols"
         url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
         alt: "Windows Symbols"
-      >
-      links: <
+      }
+      links {
         text: "status"
         url: "https://chromium-status.appspot.com/"
         alt: "Current tree status"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Dashboards"
-      links: <
+      links {
         text: "perf"
         url: "https://chromeperf.appspot.com/"
         alt: "Chrome perf dashboard"
-      >
-      links: <
+      }
+      links {
         text: "flake-portal"
         url: "https://analysis.chromium.org/p/chromium/flake-portal"
         alt: "New flake portal"
-      >
-      links: <
+      }
+      links {
         text: "legacy-flakiness"
         url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
         alt: "Legacy flakiness dashboard"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Chromium"
-      links: <
+      links {
         text: "source"
         url: "https://chromium.googlesource.com/chromium/src"
         alt: "Chromium source code repository"
-      >
-      links: <
+      }
+      links {
         text: "reviews"
         url: "https://chromium-review.googlesource.com"
         alt: "Chromium code review tool"
-      >
-      links: <
+      }
+      links {
         text: "bugs"
         url: "https://crbug.com"
         alt: "Chromium bug tracker"
-      >
-      links: <
+      }
+      links {
         text: "coverage"
         url: "https://analysis.chromium.org/p/chromium/coverage"
         alt: "Chromium code coverage dashboard"
-      >
-      links: <
+      }
+      links {
         text: "dev"
         url: "https://dev.chromium.org/Home"
         alt: "Chromium developer home page"
-      >
-      links: <
+      }
+      links {
         text: "support"
         url: "https://support.google.com/chrome/#topic=7438008"
         alt: "Google Chrome help center"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/chromium.android"
         alt: "Chromium Android console"
-      >
-      links: <
+      }
+      links {
         text: "clang"
         url: "/p/chromium/g/chromium.clang"
         alt: "Chromium Clang console"
-      >
-      links: <
+      }
+      links {
         text: "dawn"
         url: "/p/chromium/g/chromium.dawn"
         alt: "Chromium Dawn console"
-      >
-      links: <
+      }
+      links {
         text: "fuzz"
         url: "/p/chromium/g/chromium.fuzz"
         alt: "Chromium Fuzz console"
-      >
-      links: <
+      }
+      links {
         text: "fyi"
         url: "/p/chromium/g/chromium.fyi"
         alt: "Chromium FYI console"
-      >
-      links: <
+      }
+      links {
         text: "gpu"
         url: "/p/chromium/g/chromium.gpu"
         alt: "Chromium GPU console"
-      >
-      links: <
+      }
+      links {
         text: "perf"
         url: "/p/chrome/g/chrome.perf/console"
         alt: "Chromium Perf console"
-      >
-      links: <
+      }
+      links {
         text: "perf.fyi"
         url: "/p/chrome/g/chrome.perf.fyi/console"
         alt: "Chromium Perf FYI console"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/chromium.swangle"
         alt: "Chromium SWANGLE console"
-      >
-      links: <
+      }
+      links {
         text: "webrtc"
         url: "/p/chromium/g/chromium.webrtc"
         alt: "Chromium WebRTC console"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/chromium.chromiumos"
         alt: "ChromiumOS console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Branch Consoles"
-      links: <
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
         text: "m83"
         url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "chromium.gpu.fyi"
+  name: "chromium.gpu.fyi"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win Builder"
+    category: "Windows|Builder|Release"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 Builder"
+    category: "Windows|Builder|Release"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win dEQP Builder"
+    category: "Windows|Builder|dEQP"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 dEQP Builder"
+    category: "Windows|Builder|dEQP"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 DX12 Vulkan Builder"
+    category: "Windows|Builder|dx12vk"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 DX12 Vulkan Builder (dbg)"
+    category: "Windows|Builder|dx12vk"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win Builder (dbg)"
+    category: "Windows|Builder|Debug"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 Builder (dbg)"
+    category: "Windows|Builder|Debug"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI XR Win x64 Builder"
+    category: "Windows|Builder|XR"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Release (AMD RX 550)"
+    category: "Windows|10|x64|AMD"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Release (Intel HD 630)"
+    category: "Windows|10|x64|Intel"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Exp Release (Intel HD 630)"
+    category: "Windows|10|x64|Intel"
+    short_name: "exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 dEQP Release (Intel HD 630)"
+    category: "Windows|10|x64|Intel"
+    short_name: "dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Release (Intel UHD 630)"
+    category: "Windows|10|x64|Intel"
+    short_name: "uhd"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Release (NVIDIA)"
+    category: "Windows|10|x64|Nvidia"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Debug (NVIDIA)"
+    category: "Windows|10|x64|Nvidia"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Exp Release (NVIDIA)"
+    category: "Windows|10|x64|Nvidia"
+    short_name: "exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 dEQP Release (NVIDIA)"
+    category: "Windows|10|x64|Nvidia"
+    short_name: "dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)"
+    category: "Windows|10|x64|Nvidia"
+    short_name: "gtx"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 SkiaRenderer Dawn Release (NVIDIA)"
+    category: "Windows|10|x64|Nvidia"
+    short_name: "skd"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 SkiaRenderer GL (NVIDIA)"
+    category: "Windows|10|x64|Nvidia"
+    short_name: "skgl"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Release XR Perf (NVIDIA)"
+    category: "Windows|10|x64|Nvidia"
+    short_name: "xr"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 DX12 Vulkan Debug (NVIDIA)"
+    category: "Windows|10|x64|Nvidia|dx12vk"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 DX12 Vulkan Release (NVIDIA)"
+    category: "Windows|10|x64|Nvidia|dx12vk"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x86 Release (NVIDIA)"
+    category: "Windows|10|x86|Nvidia"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win7 FYI x64 Release (NVIDIA)"
+    category: "Windows|7|x64|Nvidia"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win7 FYI x64 dEQP Release (NVIDIA)"
+    category: "Windows|7|x64|Nvidia"
+    short_name: "dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win7 FYI Debug (AMD)"
+    category: "Windows|7|x86|AMD"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win7 FYI dEQP Release (AMD)"
+    category: "Windows|7|x86|AMD"
+    short_name: "dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win7 FYI Release (AMD)"
+    category: "Windows|7|x86|AMD"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win7 FYI Release (NVIDIA)"
+    category: "Windows|7|x86|Nvidia"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac FYI GPU ASAN Release"
+    category: "Mac"
+    short_name: "asn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Mac Builder"
+    category: "Mac|Builder"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Mac Builder (dbg)"
+    category: "Mac|Builder"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Mac dEQP Builder"
+    category: "Mac|Builder"
+    short_name: "dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac FYI dEQP Release AMD"
+    category: "Mac|AMD"
+    short_name: "dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac Pro FYI Release (AMD)"
+    category: "Mac|AMD|Pro"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac FYI Retina Release (AMD)"
+    category: "Mac|AMD|Retina"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac FYI Retina Debug (AMD)"
+    category: "Mac|AMD|Retina"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac FYI Experimental Retina Release (AMD)"
+    category: "Mac|AMD|Retina"
+    short_name: "exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac FYI Release (Intel)"
+    category: "Mac|Intel"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac FYI Debug (Intel)"
+    category: "Mac|Intel"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac FYI Experimental Release (Intel)"
+    category: "Mac|Intel"
+    short_name: "exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac FYI dEQP Release Intel"
+    category: "Mac|Intel"
+    short_name: "dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac FYI Retina Release (NVIDIA)"
+    category: "Mac|Nvidia"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac FYI Retina Debug (NVIDIA)"
+    category: "Mac|Nvidia"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac FYI Experimental Retina Release (NVIDIA)"
+    category: "Mac|Nvidia"
+    short_name: "exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI GPU TSAN Release"
+    category: "Linux"
+    short_name: "tsn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux Builder"
+    category: "Linux|Builder"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux Builder (dbg)"
+    category: "Linux|Builder"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux dEQP Builder"
+    category: "Linux|Builder"
+    short_name: "dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux Ozone Builder"
+    category: "Linux|Builder"
+    short_name: "ozn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI Release (AMD R7 240)"
+    category: "Linux|AMD"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI Release (Intel HD 630)"
+    category: "Linux|Intel"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI Experimental Release (Intel HD 630)"
+    category: "Linux|Intel"
+    short_name: "exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI dEQP Release (Intel HD 630)"
+    category: "Linux|Intel"
+    short_name: "dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI Ozone (Intel)"
+    category: "Linux|Intel"
+    short_name: "ozn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI SkiaRenderer Dawn Release (Intel HD 630)"
+    category: "Linux|Intel"
+    short_name: "skd"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI SkiaRenderer Vulkan (Intel HD 630)"
+    category: "Linux|Intel"
+    short_name: "skv"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI Release (Intel UHD 630)"
+    category: "Linux|Intel"
+    short_name: "uhd"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI Release (NVIDIA)"
+    category: "Linux|Nvidia"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI Debug (NVIDIA)"
+    category: "Linux|Nvidia"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI Experimental Release (NVIDIA)"
+    category: "Linux|Nvidia"
+    short_name: "exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux FYI dEQP Release (NVIDIA)"
+    category: "Linux|Nvidia"
+    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/Android FYI Release (Nexus 5)"
+    category: "Android|L32"
+    short_name: "N5"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 6)"
+    category: "Android|L32"
+    short_name: "N6"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 5X)"
+    category: "Android|M64|QCOM"
+    short_name: "N5X"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 6P)"
+    category: "Android|M64|QCOM"
+    short_name: "N6P"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 9)"
+    category: "Android|M64|NVDA"
+    short_name: "N9"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (NVIDIA Shield TV)"
+    category: "Android|N64|NVDA"
+    short_name: "STV"
+  }
+  builders {
+    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 2)"
+    category: "Android|vk|Q32"
+    short_name: "P2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 64 Vk Release (Pixel 2)"
+    category: "Android|vk|Q64"
+    short_name: "P2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI dEQP Release (Nexus 5X)"
+    category: "Android|dqp|M64"
+    short_name: "N5X"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 32 dEQP Vk Release (Pixel 2)"
+    category: "Android|dqp|vk|Q32"
+    short_name: "P2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 64 dEQP Vk Release (Pixel 2)"
+    category: "Android|dqp|vk|Q64"
+    short_name: "P2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI SkiaRenderer GL (Nexus 5X)"
+    category: "Android|skgl|M64"
+    short_name: "N5X"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI SkiaRenderer Vulkan (Pixel 2)"
+    category: "Android|skv|P32"
+    short_name: "P2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Perf Android 64 Builder"
+    category: "Android|Perf|Builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android FYI 64 Perf (Pixel 2)"
+    category: "Android|Perf|Q64"
+    short_name: "P2"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ChromeOS FYI Release (amd64-generic)"
+    category: "ChromeOS|amd64|generic"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ChromeOS FYI Release (kevin)"
+    category: "ChromeOS|arm|kevin"
+    short_name: "kvn"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
         alt: "Beta branch console"
-      >
-      links: <
-        text: "m81"
-        url: "/p/chromium/g/main-m81/console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
         alt: "Stable branch console"
-      >
-      links: <
+      }
+      links {
         text: "trunk"
         url: "/p/chromium/g/main/console"
         alt: "Trunk (ToT) console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Tryservers"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/tryserver.chromium.android/builders"
         alt: "Android"
-      >
-      links: <
+      }
+      links {
         text: "angle"
         url: "/p/chromium/g/tryserver.chromium.angle/builders"
         alt: "Angle"
-      >
-      links: <
+      }
+      links {
         text: "blink"
         url: "/p/chromium/g/tryserver.blink/builders"
         alt: "Blink"
-      >
-      links: <
+      }
+      links {
         text: "chrome"
         url: "/p/chrome/g/tryserver.chrome/builders"
         alt: "Chrome"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
-      >
-      links: <
+      }
+      links {
         text: "linux"
         url: "/p/chromium/g/tryserver.chromium.linux/builders"
         alt: "Linux"
-      >
-      links: <
+      }
+      links {
         text: "mac"
         url: "/p/chromium/g/tryserver.chromium.mac/builders"
         alt: "Mac"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/tryserver.chromium.swangle/builders"
         alt: "SWANGLE"
-      >
-      links: <
+      }
+      links {
         text: "win"
         url: "/p/chromium/g/tryserver.chromium.win/builders"
         alt: "Win"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Navigate"
-      links: <
+      links {
         text: "about"
         url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
         alt: "Tour of the console"
-      >
-      links: <
+      }
+      links {
         text: "customize"
         url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
         alt: "Customize this console"
-      >
-    >
-    console_groups: <
-      title: <
+      }
+    }
+    console_groups {
+      title {
         text: "Tree Closers"
         url: "https://chromium-status.appspot.com/"
-      >
+      }
       console_ids: "chromium/chromium"
       console_ids: "chromium/chromium.win"
       console_ids: "chromium/chromium.mac"
@@ -1592,316 +11655,366 @@ consoles: <
       console_ids: "chrome/chrome"
       console_ids: "chromium/chromium.memory"
       console_ids: "chromium/chromium.gpu"
-    >
-    console_groups: <
+    }
+    console_groups {
       console_ids: "chromium/chromium.android"
       console_ids: "chrome/chrome.perf"
       console_ids: "chromium/chromium.gpu.fyi"
       console_ids: "chromium/chromium.fuzz"
-    >
+    }
     tree_status_host: "chromium-status.appspot.com"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "chromium.linux"
   name: "chromium.linux"
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux Builder"
     category: "release"
     short_name: "bld"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux Tests"
     category: "release"
     short_name: "tst"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Network Service Linux"
+    category: "release"
+    short_name: "nsl"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-gcc-rel"
+    category: "release"
+    short_name: "gcc"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-blink-cors-rel"
+    category: "release"
+    short_name: "crs"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux"
+    category: "release"
+    short_name: "det"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/linux-ozone-rel"
     category: "release"
     short_name: "ozo"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-trusty-rel"
+    category: "release"
+    short_name: "tru"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)(32)"
+    category: "debug|builder"
+    short_name: "32"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)"
     category: "debug|builder"
     short_name: "64"
-  >
-  builders: <
+  }
+  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)"
     category: "debug|tester"
     short_name: "64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Cast Linux"
     category: "cast"
     short_name: "vid"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Cast Audio Linux"
+    category: "cast"
+    short_name: "aud"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Fuchsia ARM64"
     category: "fuchsia|a64"
     short_name: "rel"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/fuchsia-arm64-cast"
     category: "fuchsia|cast"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/fuchsia-x64-cast"
     category: "fuchsia|cast"
     short_name: "x64"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-x64-dbg"
+    category: "fuchsia|x64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Deterministic Fuchsia (dbg)"
+    category: "fuchsia|x64"
+    short_name: "det"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Fuchsia x64"
     category: "fuchsia|x64"
     short_name: "rel"
-  >
-  header: <
-    oncalls: <
+  }
+  header {
+    oncalls {
       name: "Chromium"
-      url: "https://rota-ng.appspot.com/legacy/sheriff.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
       name: "Android"
-      url: "https://rota-ng.appspot.com/legacy/sheriff_android.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
       name: "iOS"
       url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "GPU"
       url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Angle"
       url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perf"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perfbot"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Trooper"
       url: "https://rota-ng.appspot.com/legacy/trooper.json"
-    >
-    links: <
+    }
+    links {
       name: "Builds"
-      links: <
+      links {
         text: "continuous"
         url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
         alt: "Continuous browser snapshots"
-      >
-      links: <
+      }
+      links {
         text: "symbols"
         url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
         alt: "Windows Symbols"
-      >
-      links: <
+      }
+      links {
         text: "status"
         url: "https://chromium-status.appspot.com/"
         alt: "Current tree status"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Dashboards"
-      links: <
+      links {
         text: "perf"
         url: "https://chromeperf.appspot.com/"
         alt: "Chrome perf dashboard"
-      >
-      links: <
+      }
+      links {
         text: "flake-portal"
         url: "https://analysis.chromium.org/p/chromium/flake-portal"
         alt: "New flake portal"
-      >
-      links: <
+      }
+      links {
         text: "legacy-flakiness"
         url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
         alt: "Legacy flakiness dashboard"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Chromium"
-      links: <
+      links {
         text: "source"
         url: "https://chromium.googlesource.com/chromium/src"
         alt: "Chromium source code repository"
-      >
-      links: <
+      }
+      links {
         text: "reviews"
         url: "https://chromium-review.googlesource.com"
         alt: "Chromium code review tool"
-      >
-      links: <
+      }
+      links {
         text: "bugs"
         url: "https://crbug.com"
         alt: "Chromium bug tracker"
-      >
-      links: <
+      }
+      links {
         text: "coverage"
         url: "https://analysis.chromium.org/p/chromium/coverage"
         alt: "Chromium code coverage dashboard"
-      >
-      links: <
+      }
+      links {
         text: "dev"
         url: "https://dev.chromium.org/Home"
         alt: "Chromium developer home page"
-      >
-      links: <
+      }
+      links {
         text: "support"
         url: "https://support.google.com/chrome/#topic=7438008"
         alt: "Google Chrome help center"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/chromium.android"
         alt: "Chromium Android console"
-      >
-      links: <
+      }
+      links {
         text: "clang"
         url: "/p/chromium/g/chromium.clang"
         alt: "Chromium Clang console"
-      >
-      links: <
+      }
+      links {
         text: "dawn"
         url: "/p/chromium/g/chromium.dawn"
         alt: "Chromium Dawn console"
-      >
-      links: <
+      }
+      links {
         text: "fuzz"
         url: "/p/chromium/g/chromium.fuzz"
         alt: "Chromium Fuzz console"
-      >
-      links: <
+      }
+      links {
         text: "fyi"
         url: "/p/chromium/g/chromium.fyi"
         alt: "Chromium FYI console"
-      >
-      links: <
+      }
+      links {
         text: "gpu"
         url: "/p/chromium/g/chromium.gpu"
         alt: "Chromium GPU console"
-      >
-      links: <
+      }
+      links {
         text: "perf"
         url: "/p/chrome/g/chrome.perf/console"
         alt: "Chromium Perf console"
-      >
-      links: <
+      }
+      links {
         text: "perf.fyi"
         url: "/p/chrome/g/chrome.perf.fyi/console"
         alt: "Chromium Perf FYI console"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/chromium.swangle"
         alt: "Chromium SWANGLE console"
-      >
-      links: <
+      }
+      links {
         text: "webrtc"
         url: "/p/chromium/g/chromium.webrtc"
         alt: "Chromium WebRTC console"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/chromium.chromiumos"
         alt: "ChromiumOS console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Branch Consoles"
-      links: <
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
         text: "m83"
         url: "/p/chromium/g/main-m83/console"
-        alt: "Beta branch console"
-      >
-      links: <
-        text: "m81"
-        url: "/p/chromium/g/main-m81/console"
         alt: "Stable branch console"
-      >
-      links: <
+      }
+      links {
         text: "trunk"
         url: "/p/chromium/g/main/console"
         alt: "Trunk (ToT) console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Tryservers"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/tryserver.chromium.android/builders"
         alt: "Android"
-      >
-      links: <
+      }
+      links {
         text: "angle"
         url: "/p/chromium/g/tryserver.chromium.angle/builders"
         alt: "Angle"
-      >
-      links: <
+      }
+      links {
         text: "blink"
         url: "/p/chromium/g/tryserver.blink/builders"
         alt: "Blink"
-      >
-      links: <
+      }
+      links {
         text: "chrome"
         url: "/p/chrome/g/tryserver.chrome/builders"
         alt: "Chrome"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
-      >
-      links: <
+      }
+      links {
         text: "linux"
         url: "/p/chromium/g/tryserver.chromium.linux/builders"
         alt: "Linux"
-      >
-      links: <
+      }
+      links {
         text: "mac"
         url: "/p/chromium/g/tryserver.chromium.mac/builders"
         alt: "Mac"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/tryserver.chromium.swangle/builders"
         alt: "SWANGLE"
-      >
-      links: <
+      }
+      links {
         text: "win"
         url: "/p/chromium/g/tryserver.chromium.win/builders"
         alt: "Win"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Navigate"
-      links: <
+      links {
         text: "about"
         url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
         alt: "Tour of the console"
-      >
-      links: <
+      }
+      links {
         text: "customize"
         url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
         alt: "Customize this console"
-      >
-    >
-    console_groups: <
-      title: <
+      }
+    }
+    console_groups {
+      title {
         text: "Tree Closers"
         url: "https://chromium-status.appspot.com/"
-      >
+      }
       console_ids: "chromium/chromium"
       console_ids: "chromium/chromium.win"
       console_ids: "chromium/chromium.mac"
@@ -1910,321 +12023,331 @@ consoles: <
       console_ids: "chrome/chrome"
       console_ids: "chromium/chromium.memory"
       console_ids: "chromium/chromium.gpu"
-    >
-    console_groups: <
+    }
+    console_groups {
       console_ids: "chromium/chromium.android"
       console_ids: "chrome/chrome.perf"
       console_ids: "chromium/chromium.gpu.fyi"
       console_ids: "chromium/chromium.fuzz"
-    >
+    }
     tree_status_host: "chromium-status.appspot.com"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "chromium.mac"
   name: "chromium.mac"
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
+  builders {
     name: "buildbucket/luci.chromium.ci/Mac Builder"
     category: "release"
     short_name: "bld"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
     category: "release"
     short_name: "10"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
     category: "release"
     short_name: "11"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Mac10.12 Tests"
     category: "release"
     short_name: "12"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Mac10.13 Tests"
     category: "release"
     short_name: "13"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Mac10.14 Tests"
     category: "release"
     short_name: "14"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/WebKit Mac10.13 (retina)"
     category: "release"
     short_name: "ret"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
     category: "debug"
     short_name: "bld"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Mac10.13 Tests (dbg)"
     category: "debug"
     short_name: "13"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-device"
+    category: "ios|default"
+    short_name: "dev"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/ios-simulator"
     category: "ios|default"
     short_name: "sim"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/ios-simulator-full-configs"
     category: "ios|default"
     short_name: "ful"
-  >
-  header: <
-    oncalls: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-simulator-noncq"
+    category: "ios|default"
+    short_name: "non"
+  }
+  header {
+    oncalls {
       name: "Chromium"
-      url: "https://rota-ng.appspot.com/legacy/sheriff.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
       name: "Android"
-      url: "https://rota-ng.appspot.com/legacy/sheriff_android.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
       name: "iOS"
       url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "GPU"
       url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Angle"
       url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perf"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perfbot"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Trooper"
       url: "https://rota-ng.appspot.com/legacy/trooper.json"
-    >
-    links: <
+    }
+    links {
       name: "Builds"
-      links: <
+      links {
         text: "continuous"
         url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
         alt: "Continuous browser snapshots"
-      >
-      links: <
+      }
+      links {
         text: "symbols"
         url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
         alt: "Windows Symbols"
-      >
-      links: <
+      }
+      links {
         text: "status"
         url: "https://chromium-status.appspot.com/"
         alt: "Current tree status"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Dashboards"
-      links: <
+      links {
         text: "perf"
         url: "https://chromeperf.appspot.com/"
         alt: "Chrome perf dashboard"
-      >
-      links: <
+      }
+      links {
         text: "flake-portal"
         url: "https://analysis.chromium.org/p/chromium/flake-portal"
         alt: "New flake portal"
-      >
-      links: <
+      }
+      links {
         text: "legacy-flakiness"
         url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
         alt: "Legacy flakiness dashboard"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Chromium"
-      links: <
+      links {
         text: "source"
         url: "https://chromium.googlesource.com/chromium/src"
         alt: "Chromium source code repository"
-      >
-      links: <
+      }
+      links {
         text: "reviews"
         url: "https://chromium-review.googlesource.com"
         alt: "Chromium code review tool"
-      >
-      links: <
+      }
+      links {
         text: "bugs"
         url: "https://crbug.com"
         alt: "Chromium bug tracker"
-      >
-      links: <
+      }
+      links {
         text: "coverage"
         url: "https://analysis.chromium.org/p/chromium/coverage"
         alt: "Chromium code coverage dashboard"
-      >
-      links: <
+      }
+      links {
         text: "dev"
         url: "https://dev.chromium.org/Home"
         alt: "Chromium developer home page"
-      >
-      links: <
+      }
+      links {
         text: "support"
         url: "https://support.google.com/chrome/#topic=7438008"
         alt: "Google Chrome help center"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/chromium.android"
         alt: "Chromium Android console"
-      >
-      links: <
+      }
+      links {
         text: "clang"
         url: "/p/chromium/g/chromium.clang"
         alt: "Chromium Clang console"
-      >
-      links: <
+      }
+      links {
         text: "dawn"
         url: "/p/chromium/g/chromium.dawn"
         alt: "Chromium Dawn console"
-      >
-      links: <
+      }
+      links {
         text: "fuzz"
         url: "/p/chromium/g/chromium.fuzz"
         alt: "Chromium Fuzz console"
-      >
-      links: <
+      }
+      links {
         text: "fyi"
         url: "/p/chromium/g/chromium.fyi"
         alt: "Chromium FYI console"
-      >
-      links: <
+      }
+      links {
         text: "gpu"
         url: "/p/chromium/g/chromium.gpu"
         alt: "Chromium GPU console"
-      >
-      links: <
+      }
+      links {
         text: "perf"
         url: "/p/chrome/g/chrome.perf/console"
         alt: "Chromium Perf console"
-      >
-      links: <
+      }
+      links {
         text: "perf.fyi"
         url: "/p/chrome/g/chrome.perf.fyi/console"
         alt: "Chromium Perf FYI console"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/chromium.swangle"
         alt: "Chromium SWANGLE console"
-      >
-      links: <
+      }
+      links {
         text: "webrtc"
         url: "/p/chromium/g/chromium.webrtc"
         alt: "Chromium WebRTC console"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/chromium.chromiumos"
         alt: "ChromiumOS console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Branch Consoles"
-      links: <
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
         text: "m83"
         url: "/p/chromium/g/main-m83/console"
-        alt: "Beta branch console"
-      >
-      links: <
-        text: "m81"
-        url: "/p/chromium/g/main-m81/console"
         alt: "Stable branch console"
-      >
-      links: <
+      }
+      links {
         text: "trunk"
         url: "/p/chromium/g/main/console"
         alt: "Trunk (ToT) console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Tryservers"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/tryserver.chromium.android/builders"
         alt: "Android"
-      >
-      links: <
+      }
+      links {
         text: "angle"
         url: "/p/chromium/g/tryserver.chromium.angle/builders"
         alt: "Angle"
-      >
-      links: <
+      }
+      links {
         text: "blink"
         url: "/p/chromium/g/tryserver.blink/builders"
         alt: "Blink"
-      >
-      links: <
+      }
+      links {
         text: "chrome"
         url: "/p/chrome/g/tryserver.chrome/builders"
         alt: "Chrome"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
-      >
-      links: <
+      }
+      links {
         text: "linux"
         url: "/p/chromium/g/tryserver.chromium.linux/builders"
         alt: "Linux"
-      >
-      links: <
+      }
+      links {
         text: "mac"
         url: "/p/chromium/g/tryserver.chromium.mac/builders"
         alt: "Mac"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/tryserver.chromium.swangle/builders"
         alt: "SWANGLE"
-      >
-      links: <
+      }
+      links {
         text: "win"
         url: "/p/chromium/g/tryserver.chromium.win/builders"
         alt: "Win"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Navigate"
-      links: <
+      links {
         text: "about"
         url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
         alt: "Tour of the console"
-      >
-      links: <
+      }
+      links {
         text: "customize"
         url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
         alt: "Customize this console"
-      >
-    >
-    console_groups: <
-      title: <
+      }
+    }
+    console_groups {
+      title {
         text: "Tree Closers"
         url: "https://chromium-status.appspot.com/"
-      >
+      }
       console_ids: "chromium/chromium"
       console_ids: "chromium/chromium.win"
       console_ids: "chromium/chromium.mac"
@@ -2233,291 +12356,1380 @@ consoles: <
       console_ids: "chrome/chrome"
       console_ids: "chromium/chromium.memory"
       console_ids: "chromium/chromium.gpu"
-    >
-    console_groups: <
+    }
+    console_groups {
       console_ids: "chromium/chromium.android"
       console_ids: "chrome/chrome.perf"
       console_ids: "chromium/chromium.gpu.fyi"
       console_ids: "chromium/chromium.fuzz"
-    >
+    }
     tree_status_host: "chromium-status.appspot.com"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "chromium.memory"
   name: "chromium.memory"
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-asan"
+    category: "win"
+    short_name: "asn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac ASan 64 Builder"
+    category: "mac"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac ASan 64 Tests (1)"
+    category: "mac"
+    short_name: "tst"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux TSan Builder"
     category: "linux|TSan v2"
     short_name: "bld"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux TSan Tests"
     category: "linux|TSan v2"
     short_name: "tst"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux ASan LSan Builder"
     category: "linux|asan lsan"
     short_name: "bld"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux ASan LSan Tests (1)"
     category: "linux|asan lsan"
     short_name: "tst"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Linux ASan Tests (sandboxed)"
     category: "linux|asan lsan"
     short_name: "sbx"
-  >
-  header: <
-    oncalls: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux MSan Builder"
+    category: "linux|msan"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux MSan Tests"
+    category: "linux|msan"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/WebKit Linux ASAN"
+    category: "linux|webkit"
+    short_name: "asn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/WebKit Linux MSAN"
+    category: "linux|webkit"
+    short_name: "msn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/WebKit Linux Leak"
+    category: "linux|webkit"
+    short_name: "lk"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Chromium OS ASan LSan Builder"
+    category: "cros|asan"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Chromium OS ASan LSan Tests (1)"
+    category: "cros|asan"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS MSan Builder"
+    category: "cros|msan"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS MSan Tests"
+    category: "cros|msan"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-asan"
+    category: "android"
+    short_name: "asn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux CFI"
+    category: "cfi"
+    short_name: "lnx"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "chromium.swangle"
+  name: "chromium.swangle"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-swangle-x86"
+    category: "DEPS|Windows"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-swangle-x64"
+    category: "DEPS|Windows"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-swangle-x86"
+    category: "DEPS|Linux"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-swangle-x64"
+    category: "DEPS|Linux"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-swangle-tot-angle-x86"
+    category: "ToT ANGLE|Windows"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-swangle-tot-angle-x64"
+    category: "ToT ANGLE|Windows"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-swangle-tot-angle-x86"
+    category: "ToT ANGLE|Linux"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-swangle-tot-angle-x64"
+    category: "ToT ANGLE|Linux"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-swangle-tot-swiftshader-x86"
+    category: "ToT SwiftShader|Windows"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-swangle-tot-swiftshader-x64"
+    category: "ToT SwiftShader|Windows"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-swangle-tot-swiftshader-x86"
+    category: "ToT SwiftShader|Linux"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-swangle-tot-swiftshader-x64"
+    category: "ToT SwiftShader|Linux"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-swangle-chromium-x86"
+    category: "Chromium|Windows"
+    short_name: "x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-swangle-chromium-x64"
+    category: "Chromium|Mac"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-swangle-chromium-x64"
+    category: "Chromium|Linux"
+    short_name: "x64"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "chromium.webrtc"
+  name: "chromium.webrtc"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Android Builder"
+    category: "android"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Android Tester"
+    category: "android"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Linux Builder"
+    category: "linux"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Linux Tester"
+    category: "linux"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Mac Builder"
+    category: "mac"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Mac Tester"
+    category: "mac"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Win Builder"
+    category: "win"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Win10 Tester"
+    category: "win"
+    short_name: "10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Win7 Tester"
+    category: "win"
+    short_name: "7"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Win8 Tester"
+    category: "win"
+    short_name: "8"
+  }
+  header {
+    oncalls {
       name: "Chromium"
-      url: "https://rota-ng.appspot.com/legacy/sheriff.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
       name: "Android"
-      url: "https://rota-ng.appspot.com/legacy/sheriff_android.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
       name: "iOS"
       url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "GPU"
       url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Angle"
       url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perf"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perfbot"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Trooper"
       url: "https://rota-ng.appspot.com/legacy/trooper.json"
-    >
-    links: <
+    }
+    links {
       name: "Builds"
-      links: <
+      links {
         text: "continuous"
         url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
         alt: "Continuous browser snapshots"
-      >
-      links: <
+      }
+      links {
         text: "symbols"
         url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
         alt: "Windows Symbols"
-      >
-      links: <
+      }
+      links {
         text: "status"
         url: "https://chromium-status.appspot.com/"
         alt: "Current tree status"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Dashboards"
-      links: <
+      links {
         text: "perf"
         url: "https://chromeperf.appspot.com/"
         alt: "Chrome perf dashboard"
-      >
-      links: <
+      }
+      links {
         text: "flake-portal"
         url: "https://analysis.chromium.org/p/chromium/flake-portal"
         alt: "New flake portal"
-      >
-      links: <
+      }
+      links {
         text: "legacy-flakiness"
         url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
         alt: "Legacy flakiness dashboard"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Chromium"
-      links: <
+      links {
         text: "source"
         url: "https://chromium.googlesource.com/chromium/src"
         alt: "Chromium source code repository"
-      >
-      links: <
+      }
+      links {
         text: "reviews"
         url: "https://chromium-review.googlesource.com"
         alt: "Chromium code review tool"
-      >
-      links: <
+      }
+      links {
         text: "bugs"
         url: "https://crbug.com"
         alt: "Chromium bug tracker"
-      >
-      links: <
+      }
+      links {
         text: "coverage"
         url: "https://analysis.chromium.org/p/chromium/coverage"
         alt: "Chromium code coverage dashboard"
-      >
-      links: <
+      }
+      links {
         text: "dev"
         url: "https://dev.chromium.org/Home"
         alt: "Chromium developer home page"
-      >
-      links: <
+      }
+      links {
         text: "support"
         url: "https://support.google.com/chrome/#topic=7438008"
         alt: "Google Chrome help center"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/chromium.android"
         alt: "Chromium Android console"
-      >
-      links: <
+      }
+      links {
         text: "clang"
         url: "/p/chromium/g/chromium.clang"
         alt: "Chromium Clang console"
-      >
-      links: <
+      }
+      links {
         text: "dawn"
         url: "/p/chromium/g/chromium.dawn"
         alt: "Chromium Dawn console"
-      >
-      links: <
+      }
+      links {
         text: "fuzz"
         url: "/p/chromium/g/chromium.fuzz"
         alt: "Chromium Fuzz console"
-      >
-      links: <
+      }
+      links {
         text: "fyi"
         url: "/p/chromium/g/chromium.fyi"
         alt: "Chromium FYI console"
-      >
-      links: <
+      }
+      links {
         text: "gpu"
         url: "/p/chromium/g/chromium.gpu"
         alt: "Chromium GPU console"
-      >
-      links: <
+      }
+      links {
         text: "perf"
         url: "/p/chrome/g/chrome.perf/console"
         alt: "Chromium Perf console"
-      >
-      links: <
+      }
+      links {
         text: "perf.fyi"
         url: "/p/chrome/g/chrome.perf.fyi/console"
         alt: "Chromium Perf FYI console"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/chromium.swangle"
         alt: "Chromium SWANGLE console"
-      >
-      links: <
+      }
+      links {
         text: "webrtc"
         url: "/p/chromium/g/chromium.webrtc"
         alt: "Chromium WebRTC console"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/chromium.chromiumos"
         alt: "ChromiumOS console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Branch Consoles"
-      links: <
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
         text: "m83"
         url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "chromium.webrtc.fyi"
+  name: "chromium.webrtc.fyi"
+  repo_url: "https://webrtc.googlesource.com/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder (dbg)"
+    category: "android|debug|builder"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder ARM64 (dbg)"
+    category: "android|debug|builder"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Tests (dbg) (L Nexus5)"
+    category: "android|debug|tester"
+    short_name: "L"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Tests (dbg) (M Nexus5X)"
+    category: "android|debug|tester"
+    short_name: "M"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder"
+    category: "android|release"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Linux Builder (dbg)"
+    category: "linux|debug"
+    short_name: "bld"
+  }
+  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 Tester"
+    category: "linux|release"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Mac Builder (dbg)"
+    category: "mac|debug"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Mac Builder"
+    category: "mac|release"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Mac Tester"
+    category: "mac|release"
+    short_name: "tst"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Win Builder (dbg)"
+    category: "win|debug"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Win Builder"
+    category: "win|release|builder"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Win10 Tester"
+    category: "win|release|tester"
+    short_name: "10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Win7 Tester"
+    category: "win|release|tester"
+    short_name: "7"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Win8 Tester"
+    category: "win|release|tester"
+    short_name: "8"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI ios-device"
+    category: "ios"
+    short_name: "dev"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI ios-simulator"
+    category: "ios"
+    short_name: "sim"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
         alt: "Beta branch console"
-      >
-      links: <
-        text: "m81"
-        url: "/p/chromium/g/main-m81/console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
         alt: "Stable branch console"
-      >
-      links: <
+      }
+      links {
         text: "trunk"
         url: "/p/chromium/g/main/console"
         alt: "Trunk (ToT) console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Tryservers"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/tryserver.chromium.android/builders"
         alt: "Android"
-      >
-      links: <
+      }
+      links {
         text: "angle"
         url: "/p/chromium/g/tryserver.chromium.angle/builders"
         alt: "Angle"
-      >
-      links: <
+      }
+      links {
         text: "blink"
         url: "/p/chromium/g/tryserver.blink/builders"
         alt: "Blink"
-      >
-      links: <
+      }
+      links {
         text: "chrome"
         url: "/p/chrome/g/tryserver.chrome/builders"
         alt: "Chrome"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
-      >
-      links: <
+      }
+      links {
         text: "linux"
         url: "/p/chromium/g/tryserver.chromium.linux/builders"
         alt: "Linux"
-      >
-      links: <
+      }
+      links {
         text: "mac"
         url: "/p/chromium/g/tryserver.chromium.mac/builders"
         alt: "Mac"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/tryserver.chromium.swangle/builders"
         alt: "SWANGLE"
-      >
-      links: <
+      }
+      links {
         text: "win"
         url: "/p/chromium/g/tryserver.chromium.win/builders"
         alt: "Win"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Navigate"
-      links: <
+      links {
         text: "about"
         url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
         alt: "Tour of the console"
-      >
-      links: <
+      }
+      links {
         text: "customize"
         url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
         alt: "Customize this console"
-      >
-    >
-    console_groups: <
-      title: <
+      }
+    }
+    console_groups {
+      title {
         text: "Tree Closers"
         url: "https://chromium-status.appspot.com/"
-      >
+      }
       console_ids: "chromium/chromium"
       console_ids: "chromium/chromium.win"
       console_ids: "chromium/chromium.mac"
@@ -2526,291 +13738,326 @@ consoles: <
       console_ids: "chrome/chrome"
       console_ids: "chromium/chromium.memory"
       console_ids: "chromium/chromium.gpu"
-    >
-    console_groups: <
+    }
+    console_groups {
       console_ids: "chromium/chromium.android"
       console_ids: "chrome/chrome.perf"
       console_ids: "chromium/chromium.gpu.fyi"
       console_ids: "chromium/chromium.fuzz"
-    >
+    }
     tree_status_host: "chromium-status.appspot.com"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "chromium.win"
   name: "chromium.win"
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win Builder"
+    category: "release|builder"
+    short_name: "32"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Win x64 Builder"
     category: "release|builder"
     short_name: "64"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win7 (32) Tests"
+    category: "release|tester"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win7 Tests (1)"
+    category: "release|tester"
+    short_name: "32"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Win 7 Tests x64 (1)"
     category: "release|tester"
     short_name: "64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Win10 Tests x64"
     category: "release|tester"
     short_name: "w10"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win x64 Builder (dbg)"
+    category: "debug|builder"
+    short_name: "64"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Win Builder (dbg)"
     category: "debug|builder"
     short_name: "32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/Win7 Tests (dbg)(1)"
     category: "debug|tester"
     short_name: "7"
-  >
-  header: <
-    oncalls: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 Tests x64 (dbg)"
+    category: "debug|tester"
+    short_name: "10"
+  }
+  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"
+  }
+  header {
+    oncalls {
       name: "Chromium"
-      url: "https://rota-ng.appspot.com/legacy/sheriff.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
       name: "Android"
-      url: "https://rota-ng.appspot.com/legacy/sheriff_android.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
       name: "iOS"
       url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "GPU"
       url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Angle"
       url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perf"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perfbot"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Trooper"
       url: "https://rota-ng.appspot.com/legacy/trooper.json"
-    >
-    links: <
+    }
+    links {
       name: "Builds"
-      links: <
+      links {
         text: "continuous"
         url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
         alt: "Continuous browser snapshots"
-      >
-      links: <
+      }
+      links {
         text: "symbols"
         url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
         alt: "Windows Symbols"
-      >
-      links: <
+      }
+      links {
         text: "status"
         url: "https://chromium-status.appspot.com/"
         alt: "Current tree status"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Dashboards"
-      links: <
+      links {
         text: "perf"
         url: "https://chromeperf.appspot.com/"
         alt: "Chrome perf dashboard"
-      >
-      links: <
+      }
+      links {
         text: "flake-portal"
         url: "https://analysis.chromium.org/p/chromium/flake-portal"
         alt: "New flake portal"
-      >
-      links: <
+      }
+      links {
         text: "legacy-flakiness"
         url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
         alt: "Legacy flakiness dashboard"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Chromium"
-      links: <
+      links {
         text: "source"
         url: "https://chromium.googlesource.com/chromium/src"
         alt: "Chromium source code repository"
-      >
-      links: <
+      }
+      links {
         text: "reviews"
         url: "https://chromium-review.googlesource.com"
         alt: "Chromium code review tool"
-      >
-      links: <
+      }
+      links {
         text: "bugs"
         url: "https://crbug.com"
         alt: "Chromium bug tracker"
-      >
-      links: <
+      }
+      links {
         text: "coverage"
         url: "https://analysis.chromium.org/p/chromium/coverage"
         alt: "Chromium code coverage dashboard"
-      >
-      links: <
+      }
+      links {
         text: "dev"
         url: "https://dev.chromium.org/Home"
         alt: "Chromium developer home page"
-      >
-      links: <
+      }
+      links {
         text: "support"
         url: "https://support.google.com/chrome/#topic=7438008"
         alt: "Google Chrome help center"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/chromium.android"
         alt: "Chromium Android console"
-      >
-      links: <
+      }
+      links {
         text: "clang"
         url: "/p/chromium/g/chromium.clang"
         alt: "Chromium Clang console"
-      >
-      links: <
+      }
+      links {
         text: "dawn"
         url: "/p/chromium/g/chromium.dawn"
         alt: "Chromium Dawn console"
-      >
-      links: <
+      }
+      links {
         text: "fuzz"
         url: "/p/chromium/g/chromium.fuzz"
         alt: "Chromium Fuzz console"
-      >
-      links: <
+      }
+      links {
         text: "fyi"
         url: "/p/chromium/g/chromium.fyi"
         alt: "Chromium FYI console"
-      >
-      links: <
+      }
+      links {
         text: "gpu"
         url: "/p/chromium/g/chromium.gpu"
         alt: "Chromium GPU console"
-      >
-      links: <
+      }
+      links {
         text: "perf"
         url: "/p/chrome/g/chrome.perf/console"
         alt: "Chromium Perf console"
-      >
-      links: <
+      }
+      links {
         text: "perf.fyi"
         url: "/p/chrome/g/chrome.perf.fyi/console"
         alt: "Chromium Perf FYI console"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/chromium.swangle"
         alt: "Chromium SWANGLE console"
-      >
-      links: <
+      }
+      links {
         text: "webrtc"
         url: "/p/chromium/g/chromium.webrtc"
         alt: "Chromium WebRTC console"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/chromium.chromiumos"
         alt: "ChromiumOS console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Branch Consoles"
-      links: <
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
         text: "m83"
         url: "/p/chromium/g/main-m83/console"
-        alt: "Beta branch console"
-      >
-      links: <
-        text: "m81"
-        url: "/p/chromium/g/main-m81/console"
         alt: "Stable branch console"
-      >
-      links: <
+      }
+      links {
         text: "trunk"
         url: "/p/chromium/g/main/console"
         alt: "Trunk (ToT) console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Tryservers"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/tryserver.chromium.android/builders"
         alt: "Android"
-      >
-      links: <
+      }
+      links {
         text: "angle"
         url: "/p/chromium/g/tryserver.chromium.angle/builders"
         alt: "Angle"
-      >
-      links: <
+      }
+      links {
         text: "blink"
         url: "/p/chromium/g/tryserver.blink/builders"
         alt: "Blink"
-      >
-      links: <
+      }
+      links {
         text: "chrome"
         url: "/p/chrome/g/tryserver.chrome/builders"
         alt: "Chrome"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
-      >
-      links: <
+      }
+      links {
         text: "linux"
         url: "/p/chromium/g/tryserver.chromium.linux/builders"
         alt: "Linux"
-      >
-      links: <
+      }
+      links {
         text: "mac"
         url: "/p/chromium/g/tryserver.chromium.mac/builders"
         alt: "Mac"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/tryserver.chromium.swangle/builders"
         alt: "SWANGLE"
-      >
-      links: <
+      }
+      links {
         text: "win"
         url: "/p/chromium/g/tryserver.chromium.win/builders"
         alt: "Win"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Navigate"
-      links: <
+      links {
         text: "about"
         url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
         alt: "Tour of the console"
-      >
-      links: <
+      }
+      links {
         text: "customize"
         url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
         alt: "Customize this console"
-      >
-    >
-    console_groups: <
-      title: <
+      }
+    }
+    console_groups {
+      title {
         text: "Tree Closers"
         url: "https://chromium-status.appspot.com/"
-      >
+      }
       console_ids: "chromium/chromium"
       console_ids: "chromium/chromium.win"
       console_ids: "chromium/chromium.mac"
@@ -2819,679 +14066,702 @@ consoles: <
       console_ids: "chrome/chrome"
       console_ids: "chromium/chromium.memory"
       console_ids: "chromium/chromium.gpu"
-    >
-    console_groups: <
+    }
+    console_groups {
       console_ids: "chromium/chromium.android"
       console_ids: "chrome/chrome.perf"
       console_ids: "chromium/chromium.gpu.fyi"
       console_ids: "chromium/chromium.fuzz"
-    >
+    }
     tree_status_host: "chromium-status.appspot.com"
-  >
->
-consoles: <
-  id: "main"
-  name: "M84 Main Console"
+  }
+}
+consoles {
+  id: "findit"
+  name: "findit"
+  builders {
+    name: "buildbucket/luci.chromium.findit/findit-rerun"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.findit/findit_variable"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.findit/linux_chromium_bot_db_exporter"
+  }
+  builder_view_only: true
+}
+consoles {
+  id: "goma.latest"
+  name: "goma.latest"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/4147"
+  refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Win x64 Builder"
-    category: "chromium.win|release|builder"
-    short_name: "64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Win 7 Tests x64 (1)"
-    category: "chromium.win|release|tester"
-    short_name: "64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Win10 Tests x64"
-    category: "chromium.win|release|tester"
-    short_name: "w10"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Win Builder (dbg)"
-    category: "chromium.win|debug|builder"
-    short_name: "32"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Win7 Tests (dbg)(1)"
-    category: "chromium.win|debug|tester"
-    short_name: "7"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Mac Builder"
-    category: "chromium.mac|release"
-    short_name: "bld"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
-    category: "chromium.mac|release"
-    short_name: "10"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
-    category: "chromium.mac|release"
-    short_name: "11"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Mac10.12 Tests"
-    category: "chromium.mac|release"
-    short_name: "12"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Mac10.13 Tests"
-    category: "chromium.mac|release"
-    short_name: "13"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Mac10.14 Tests"
-    category: "chromium.mac|release"
-    short_name: "14"
-  >
-  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"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Mac10.13 Tests (dbg)"
-    category: "chromium.mac|debug"
-    short_name: "13"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/ios-simulator"
-    category: "chromium.mac|ios|default"
-    short_name: "sim"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/ios-simulator-full-configs"
-    category: "chromium.mac|ios|default"
-    short_name: "ful"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux Builder"
-    category: "chromium.linux|release"
-    short_name: "bld"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux Tests"
-    category: "chromium.linux|release"
-    short_name: "tst"
-  >
-  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)"
-    category: "chromium.linux|debug|builder"
-    short_name: "64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)"
-    category: "chromium.linux|debug|tester"
-    short_name: "64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Cast Linux"
-    category: "chromium.linux|cast"
-    short_name: "vid"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Fuchsia ARM64"
-    category: "chromium.linux|fuchsia|a64"
-    short_name: "rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/fuchsia-arm64-cast"
-    category: "chromium.linux|fuchsia|cast"
-    short_name: "a64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/fuchsia-x64-cast"
-    category: "chromium.linux|fuchsia|cast"
-    short_name: "x64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Fuchsia x64"
-    category: "chromium.linux|fuchsia|x64"
-    short_name: "rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/linux-chromeos-rel"
-    category: "chromium.chromiumos|default"
-    short_name: "rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/linux-chromeos-dbg"
-    category: "chromium.chromiumos|default"
-    short_name: "dbg"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/chromeos-arm-generic-rel"
-    category: "chromium.chromiumos|simple|release"
-    short_name: "arm"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/chromeos-kevin-rel"
-    category: "chromium.chromiumos|simple|release"
-    short_name: "kvn"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel"
-    category: "chromium.chromiumos|simple|release|x64"
-    short_name: "rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-dbg"
-    category: "chromium.chromiumos|simple|debug|x64"
-    short_name: "dbg"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/android-cronet-arm-dbg"
-    category: "chromium.android|cronet|arm"
-    short_name: "dbg"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/android-cronet-arm-rel"
-    category: "chromium.android|cronet|arm"
-    short_name: "rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/android-cronet-kitkat-arm-rel"
-    category: "chromium.android|cronet|test"
-    short_name: "k"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/android-cronet-lollipop-arm-rel"
-    category: "chromium.android|cronet|test"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Android arm Builder (dbg)"
-    category: "chromium.android|builder|arm"
-    short_name: "32"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Android arm64 Builder (dbg)"
-    category: "chromium.android|builder|arm"
-    short_name: "64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Android x86 Builder (dbg)"
-    category: "chromium.android|builder|x86"
-    short_name: "32"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Android x64 Builder (dbg)"
-    category: "chromium.android|builder|x86"
-    short_name: "64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Marshmallow 64 bit Tester"
-    category: "chromium.android|tester|phone"
-    short_name: "M"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Nougat Phone Tester"
-    category: "chromium.android|tester|phone"
-    short_name: "N"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Oreo Phone Tester"
-    category: "chromium.android|tester|phone"
-    short_name: "O"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/android-pie-arm64-dbg"
-    category: "chromium.android|tester|phone"
-    short_name: "P"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Android WebView M (dbg)"
-    category: "chromium.android|tester|webview"
-    short_name: "M"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Android WebView N (dbg)"
-    category: "chromium.android|tester|webview"
-    short_name: "N"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Android WebView O (dbg)"
-    category: "chromium.android|tester|webview"
-    short_name: "O"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Android WebView P (dbg)"
-    category: "chromium.android|tester|webview"
-    short_name: "P"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/android-lollipop-arm-rel"
-    category: "chromium.android|on_cq"
-    short_name: "L"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/android-marshmallow-arm64-rel"
-    category: "chromium.android|on_cq"
-    short_name: "M"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/android-pie-arm64-rel"
-    category: "chromium.android|on_cq"
-    short_name: "P"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Cast Android (dbg)"
-    category: "chromium.android|on_cq"
-    short_name: "cst"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux TSan Builder"
-    category: "chromium.memory|linux|TSan v2"
-    short_name: "bld"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux TSan Tests"
-    category: "chromium.memory|linux|TSan v2"
-    short_name: "tst"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Builder"
-    category: "chromium.memory|linux|asan lsan"
-    short_name: "bld"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Tests (1)"
-    category: "chromium.memory|linux|asan lsan"
-    short_name: "tst"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux ASan Tests (sandboxed)"
-    category: "chromium.memory|linux|asan lsan"
-    short_name: "sbx"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Builder"
-    category: "chromium.dawn|DEPS|Linux|Builder"
-    short_name: "x64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
-    category: "chromium.dawn|DEPS|Linux|Intel"
-    short_name: "x64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
-    category: "chromium.dawn|DEPS|Linux|Nvidia"
-    short_name: "x64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Builder"
-    category: "chromium.dawn|DEPS|Mac|Builder"
-    short_name: "x64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Release (AMD)"
-    category: "chromium.dawn|DEPS|Mac|AMD"
-    short_name: "x64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Release (Intel)"
-    category: "chromium.dawn|DEPS|Mac|Intel"
-    short_name: "x64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Builder"
-    category: "chromium.dawn|DEPS|Windows|Builder"
-    short_name: "x86"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Builder"
-    category: "chromium.dawn|DEPS|Windows|Builder"
-    short_name: "x64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
-    category: "chromium.dawn|DEPS|Windows|Intel"
-    short_name: "x86"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
-    category: "chromium.dawn|DEPS|Windows|Intel"
-    short_name: "x64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
-    category: "chromium.dawn|DEPS|Windows|Nvidia"
-    short_name: "x86"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
-    category: "chromium.dawn|DEPS|Windows|Nvidia"
-    short_name: "x64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/GPU Win x64 Builder"
-    category: "chromium.gpu|Windows"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Win10 x64 Release (NVIDIA)"
-    category: "chromium.gpu|Windows"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/GPU Mac Builder"
-    category: "chromium.gpu|Mac"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Mac Release (Intel)"
-    category: "chromium.gpu|Mac"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Mac Retina Release (AMD)"
-    category: "chromium.gpu|Mac"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/GPU Linux Builder"
-    category: "chromium.gpu|Linux"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux Release (NVIDIA)"
-    category: "chromium.gpu|Linux"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Android Release (Nexus 5X)"
-    category: "chromium.gpu|Android"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/ios-simulator-cronet"
-    category: "chromium.fyi|cronet"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/mac-osxbeta-rel"
-    category: "chromium.fyi|mac"
-    short_name: "beta"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/chromeos-kevin-rel-hw-tests"
-    category: "chromium.fyi|chromeos"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/VR Linux"
-    category: "chromium.fyi|linux"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (Headless)"
-    category: "chromium.fyi|linux"
-    short_name: "loh"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (Wayland)"
-    category: "chromium.fyi|linux"
-    short_name: "low"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (X11)"
-    category: "chromium.fyi|linux"
-    short_name: "lox"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Win10 Tests x64 1803"
-    category: "chromium.fyi|win10|1803"
-  >
-  header: <
-    oncalls: <
+  builders {
+    name: "buildbucket/luci.chromium.goma/Win Builder Goma Latest Client"
+    category: "win|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Win Builder (dbg) Goma Latest Client"
+    category: "win|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/win32-archive-rel-goma-latest-localoutputcache"
+    category: "win|rel"
+    short_name: "loc"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Win7 Builder Goma Latest Client"
+    category: "win7|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Win7 Builder (dbg) Goma Latest Client"
+    category: "win7|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Mac Builder Goma Latest Client"
+    category: "mac|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Mac Builder (dbg) Goma Latest Client"
+    category: "mac|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/mac-archive-rel-goma-latest"
+    category: "mac|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Mac Builder (dbg) Goma Latest Client (clobber)"
+    category: "mac|dbg"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/mac-archive-rel-goma-latest-localoutputcache"
+    category: "mac|rel"
+    short_name: "loc"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/chromeos-amd64-generic-rel-goma-latest"
+    category: "cros|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Linux Builder Goma Latest Client"
+    category: "linux|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/linux-archive-rel-goma-latest"
+    category: "linux|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/linux-archive-rel-goma-latest-localoutputcache"
+    category: "linux|rel"
+    short_name: "loc"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/android-archive-dbg-goma-latest"
+    category: "android|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/ios-device-goma-latest-clobber"
+    category: "ios"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/linux-archive-rel-goma-rbe-latest"
+    category: "rbe|linux|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/linux-archive-rel-goma-rbe-ats-latest"
+    category: "rbe|linux|rel"
+    short_name: "ats"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Linux Builder Goma RBE Latest Client"
+    category: "rbe|linux|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/chromeos-amd64-generic-rel-goma-rbe-latest"
+    category: "rbe|cros|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/android-archive-dbg-goma-rbe-latest"
+    category: "rbe|android|dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/android-archive-dbg-goma-rbe-ats-latest"
+    category: "rbe|android|dbg"
+    short_name: "ats"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/mac-archive-rel-goma-rbe-latest"
+    category: "rbe|mac|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Mac Builder (dbg) Goma RBE Latest Client (clobber)"
+    category: "rbe|mac|dbg"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/ios-device-goma-rbe-latest-clobber"
+    category: "rbe|ios"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Win Builder Goma RBE Latest Client"
+    category: "rbe|win|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Win Builder (dbg) Goma RBE Latest Client"
+    category: "rbe|win|dbg"
+  }
+  header {
+    oncalls {
       name: "Chromium"
-      url: "https://rota-ng.appspot.com/legacy/sheriff.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
       name: "Android"
-      url: "https://rota-ng.appspot.com/legacy/sheriff_android.json"
-    >
-    oncalls: <
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
       name: "iOS"
       url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "GPU"
       url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Angle"
       url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perf"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Perfbot"
       url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
-    >
-    oncalls: <
+    }
+    oncalls {
       name: "Trooper"
       url: "https://rota-ng.appspot.com/legacy/trooper.json"
-    >
-    links: <
+    }
+    links {
       name: "Builds"
-      links: <
+      links {
         text: "continuous"
         url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
         alt: "Continuous browser snapshots"
-      >
-      links: <
+      }
+      links {
         text: "symbols"
         url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
         alt: "Windows Symbols"
-      >
-      links: <
+      }
+      links {
         text: "status"
         url: "https://chromium-status.appspot.com/"
         alt: "Current tree status"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Dashboards"
-      links: <
+      links {
         text: "perf"
         url: "https://chromeperf.appspot.com/"
         alt: "Chrome perf dashboard"
-      >
-      links: <
+      }
+      links {
         text: "flake-portal"
         url: "https://analysis.chromium.org/p/chromium/flake-portal"
         alt: "New flake portal"
-      >
-      links: <
+      }
+      links {
         text: "legacy-flakiness"
         url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
         alt: "Legacy flakiness dashboard"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Chromium"
-      links: <
+      links {
         text: "source"
         url: "https://chromium.googlesource.com/chromium/src"
         alt: "Chromium source code repository"
-      >
-      links: <
+      }
+      links {
         text: "reviews"
         url: "https://chromium-review.googlesource.com"
         alt: "Chromium code review tool"
-      >
-      links: <
+      }
+      links {
         text: "bugs"
         url: "https://crbug.com"
         alt: "Chromium bug tracker"
-      >
-      links: <
+      }
+      links {
         text: "coverage"
         url: "https://analysis.chromium.org/p/chromium/coverage"
         alt: "Chromium code coverage dashboard"
-      >
-      links: <
+      }
+      links {
         text: "dev"
         url: "https://dev.chromium.org/Home"
         alt: "Chromium developer home page"
-      >
-      links: <
+      }
+      links {
         text: "support"
         url: "https://support.google.com/chrome/#topic=7438008"
         alt: "Google Chrome help center"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/chromium.android"
         alt: "Chromium Android console"
-      >
-      links: <
+      }
+      links {
         text: "clang"
         url: "/p/chromium/g/chromium.clang"
         alt: "Chromium Clang console"
-      >
-      links: <
+      }
+      links {
         text: "dawn"
         url: "/p/chromium/g/chromium.dawn"
         alt: "Chromium Dawn console"
-      >
-      links: <
+      }
+      links {
         text: "fuzz"
         url: "/p/chromium/g/chromium.fuzz"
         alt: "Chromium Fuzz console"
-      >
-      links: <
+      }
+      links {
         text: "fyi"
         url: "/p/chromium/g/chromium.fyi"
         alt: "Chromium FYI console"
-      >
-      links: <
+      }
+      links {
         text: "gpu"
         url: "/p/chromium/g/chromium.gpu"
         alt: "Chromium GPU console"
-      >
-      links: <
+      }
+      links {
         text: "perf"
         url: "/p/chrome/g/chrome.perf/console"
         alt: "Chromium Perf console"
-      >
-      links: <
+      }
+      links {
         text: "perf.fyi"
         url: "/p/chrome/g/chrome.perf.fyi/console"
         alt: "Chromium Perf FYI console"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/chromium.swangle"
         alt: "Chromium SWANGLE console"
-      >
-      links: <
+      }
+      links {
         text: "webrtc"
         url: "/p/chromium/g/chromium.webrtc"
         alt: "Chromium WebRTC console"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/chromium.chromiumos"
         alt: "ChromiumOS console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Branch Consoles"
-      links: <
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
+        alt: "Beta branch console"
+      }
+      links {
         text: "m83"
         url: "/p/chromium/g/main-m83/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
+  id: "luci.chromium.goma"
+  name: "luci.chromium.goma"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma Staging"
+    category: "clients5"
+    short_name: "lnx"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Mac Goma Staging"
+    category: "clients5"
+    short_name: "mac"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/CrWinGomaStaging"
+    category: "clients5"
+    short_name: "win"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma RBE Staging (clobber)"
+    category: "rbe|rel"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma RBE Staging"
+    category: "rbe|rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma RBE Staging (dbg) (clobber)"
+    category: "rbe|debug"
+    short_name: "clb"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.goma/Chromium Linux Goma RBE Staging (dbg)"
+    category: "rbe|debug"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+    }
+    oncalls {
+      name: "Angle"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://rota-ng.appspot.com/legacy/trooper.json"
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang 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"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m84"
+        url: "/p/chromium/g/main-m84/console"
         alt: "Beta branch console"
-      >
-      links: <
-        text: "m81"
-        url: "/p/chromium/g/main-m81/console"
+      }
+      links {
+        text: "m83"
+        url: "/p/chromium/g/main-m83/console"
         alt: "Stable branch console"
-      >
-      links: <
+      }
+      links {
         text: "trunk"
         url: "/p/chromium/g/main/console"
         alt: "Trunk (ToT) console"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Tryservers"
-      links: <
+      links {
         text: "android"
         url: "/p/chromium/g/tryserver.chromium.android/builders"
         alt: "Android"
-      >
-      links: <
+      }
+      links {
         text: "angle"
         url: "/p/chromium/g/tryserver.chromium.angle/builders"
         alt: "Angle"
-      >
-      links: <
+      }
+      links {
         text: "blink"
         url: "/p/chromium/g/tryserver.blink/builders"
         alt: "Blink"
-      >
-      links: <
+      }
+      links {
         text: "chrome"
         url: "/p/chrome/g/tryserver.chrome/builders"
         alt: "Chrome"
-      >
-      links: <
+      }
+      links {
         text: "chromiumos"
         url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
         alt: "ChromiumOS"
-      >
-      links: <
+      }
+      links {
         text: "linux"
         url: "/p/chromium/g/tryserver.chromium.linux/builders"
         alt: "Linux"
-      >
-      links: <
+      }
+      links {
         text: "mac"
         url: "/p/chromium/g/tryserver.chromium.mac/builders"
         alt: "Mac"
-      >
-      links: <
+      }
+      links {
         text: "swangle"
         url: "/p/chromium/g/tryserver.chromium.swangle/builders"
         alt: "SWANGLE"
-      >
-      links: <
+      }
+      links {
         text: "win"
         url: "/p/chromium/g/tryserver.chromium.win/builders"
         alt: "Win"
-      >
-    >
-    links: <
+      }
+    }
+    links {
       name: "Navigate"
-      links: <
+      links {
         text: "about"
         url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
         alt: "Tour of the console"
-      >
-      links: <
+      }
+      links {
         text: "customize"
         url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo.cfg"
         alt: "Customize this console"
-      >
-    >
-    console_groups: <
-      title: <
+      }
+    }
+    console_groups {
+      title {
         text: "Tree Closers"
         url: "https://chromium-status.appspot.com/"
-      >
+      }
       console_ids: "chromium/chromium"
       console_ids: "chromium/chromium.win"
       console_ids: "chromium/chromium.mac"
@@ -3500,366 +14770,1426 @@ consoles: <
       console_ids: "chrome/chrome"
       console_ids: "chromium/chromium.memory"
       console_ids: "chromium/chromium.gpu"
-    >
-    console_groups: <
+    }
+    console_groups {
       console_ids: "chromium/chromium.android"
       console_ids: "chrome/chrome.perf"
       console_ids: "chromium/chromium.gpu.fyi"
       console_ids: "chromium/chromium.fuzz"
-    >
+    }
     tree_status_host: "chromium-status.appspot.com"
-  >
->
-consoles: <
-  id: "try"
-  name: "M84 CQ console"
-  builders: <
-    name: "buildbucket/luci.chromium.try/android-binary-size"
-  >
-  builders: <
+  }
+  include_experimental_builds: true
+}
+consoles {
+  id: "luci.chromium.try"
+  name: "luci.chromium.try"
+  builders {
     name: "buildbucket/luci.chromium.try/android-cronet-arm-dbg"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android-lollipop-arm-rel"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android-marshmallow-arm64-rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/android-pie-arm64-dbg"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-marshmallow-x86-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-nougat-arm64-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-oreo-arm64-cts-networkservice-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-pie-arm64-coverage-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android-pie-arm64-rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-pie-x86-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-10-arm64-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-webview-pie-arm64-fyi-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_archive_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_arm64_dbg_recipe"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_angle_deqp_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_angle_vk32_deqp_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_angle_vk64_deqp_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_angle_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_angle_vk32_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_angle_vk64_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_cfi_rel_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android_compile_dbg"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android_compile_x64_dbg"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android_compile_x86_dbg"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/android_cronet"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_mojo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_n5x_swarming_dbg"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android_optional_gpu_tests_rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/cast_shell_android"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-webview-marshmallow-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-webview-nougat-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-webview-oreo-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-webview-pie-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/cast_shell_audio_linux"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/cast_shell_linux"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/chromeos-amd64-generic-cfi-thin-lto-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/chromeos-amd64-generic-dbg"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/chromeos-amd64-generic-rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/chromeos-arm-generic-dbg"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/chromeos-arm-generic-rel"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/chromeos-kevin-compile-rel"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/chromeos-kevin-rel"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/chromium_presubmit"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/closure_compilation"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/dawn-linux-x64-deps-rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/dawn-mac-x64-deps-rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/dawn-win10-x64-deps-rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/dawn-win10-x86-deps-rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/fuchsia-arm64-cast"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/fuchsia-x64-cast"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/fuchsia_arm64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/fuchsia_x64"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/ios-simulator"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/ios-simulator-cronet"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/ios-simulator-full-configs"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/linux-blink-rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/linux-chromeos-compile-dbg"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia-angle-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia-compile-x64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-l-nexus-5-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-l-nexus-6-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-5x-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-5x-deqp-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-5x-skgl-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-6p-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-9-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-n-nvidia-shield-tv-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-skv-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-deqp-vk-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-deqp-vk-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-vk-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-vk-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-intel-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-intel-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-intel-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-intel-skv"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-skv"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-tsn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-amd-dbg-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-amd-dqp-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-amd-rel-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-nvidia-dqp-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-nvidia-rel-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-nvidia-rel-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-intel-dqp-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-intel-exp-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-intel-rel-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-dbg-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-dqp-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-exp-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-rel-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-rel-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-skgl-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-amd-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-amd-pro-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-amd-retina-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-amd-retina-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-amd-retina-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-intel-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-intel-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-intel-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-intel-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-nvidia-retina-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-nvidia-retina-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-nvidia-retina-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-try-android-m-nexus-5x-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-try-linux-nvidia-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-try-linux-nvidia-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-try-mac-amd-retina-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-try-mac-intel-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-angle-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-autofill-assistant"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-blink-heap-concurrent-marking-tsan-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-blink-heap-verification-try"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux-chromeos-rel"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux-libfuzzer-asan-rel"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux-ozone-rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/linux-rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_android_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_angle_deqp_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_angle_ozone_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_analysis"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_archive_rel_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_asan_rel_ng"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_cfi_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_asan_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_msan_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_clobber_deterministic"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_clobber_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_compile_dbg_32_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_compile_dbg_ng"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_compile_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-clang-tidy-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-clang-tidy-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_dbg_ng"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_msan_rel_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_tsan_rel_ng"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_ubsan_rel_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_layout_tests_composite_after_paint"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-layout-tests-edit-ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-layout-tests-fragment-item"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_layout_tests_layout_ng_disabled"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_mojo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_mojo_chromeos"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_optional_gpu_tests_rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/linux_vr"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_upload_clang"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-viz-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-wpt-fyi-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/network_service_linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-device"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-simulator"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-simulator-cronet"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-simulator-eg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios13-sdk-simulator"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac-angle-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/mac-rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac-coverage-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_10.10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_10.12_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_10.13_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_10.14_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_10.15_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_archive_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_asan_rel_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_compile_dbg_ng"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_compile_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_dbg_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/mac_optional_gpu_tests_rel"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.try/win-libfuzzer-asan-rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_upload_clang"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/tricium-metrics-analysis"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/try-nougat-phone-tester"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-oreo-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-pie-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win7-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win10_chromium_x64_dbg_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/win10_chromium_x64_rel_ng"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win10_chromium_x64_rel_ng_exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-angle-deqp-rel-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-angle-deqp-rel-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-angle-rel-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-angle-rel-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_archive"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/win_chromium_compile_dbg_ng"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_chromium_compile_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_chromium_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_chromium_x64_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_mojo"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/win_optional_gpu_tests_rel"
-  >
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_upload_clang"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_x64_archive"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-celab-try-rel"
+  }
   builder_view_only: true
->
-consoles: <
+}
+consoles {
   id: "tryserver.blink"
   name: "tryserver.blink"
-  builders: <
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-blink-optional-highdpi-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux-blink-rel"
-  >
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac10.10-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac10.11-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac10.12-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac10.13-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac10.13_retina-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac10.14-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac10.15-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win10-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win7-blink-rel"
+  }
+  builder_view_only: true
+}
+consoles {
+  id: "tryserver.chromium"
+  name: "tryserver.chromium"
+  builders {
+    name: "buildbucket/luci.chromium.try/android-official"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia-official"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-official"
+  }
   builder_view_only: true
->
-consoles: <
+}
+consoles {
   id: "tryserver.chromium.android"
   name: "tryserver.chromium.android"
-  builders: <
+  builders {
+    name: "buildbucket/luci.chromium.try/android-10-arm64-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-bfcache-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android-binary-size"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android-cronet-arm-dbg"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-deterministic-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-deterministic-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android-lollipop-arm-rel"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android-marshmallow-arm64-rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-marshmallow-x86-fyi-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-marshmallow-x86-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-nougat-arm64-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-opus-arm-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-oreo-arm64-cts-networkservice-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-oreo-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-pie-arm64-coverage-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android-pie-arm64-dbg"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android-pie-arm64-rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-pie-x86-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-weblayer-pie-arm64-fyi-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-weblayer-pie-x86-fyi-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-webview-marshmallow-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-webview-nougat-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-webview-oreo-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-webview-pie-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-webview-pie-arm64-fyi-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_archive_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_arm64_dbg_recipe"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_blink_rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_cfi_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_clang_dbg_recipe"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android_compile_dbg"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android_compile_x64_dbg"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android_compile_x86_dbg"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android_cronet"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_mojo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_n5x_swarming_dbg"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/android_optional_gpu_tests_rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_unswarmed_pixel_aosp"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/cast_shell_android"
-  >
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-l-nexus-5-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-l-nexus-6-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-5x-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-5x-deqp-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-5x-skgl-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-6p-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-9-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-n-nvidia-shield-tv-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-skv-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-deqp-vk-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-deqp-vk-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-vk-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-vk-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-try-android-m-nexus-5x-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_android_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/try-nougat-phone-tester"
+  }
   builder_view_only: true
->
-consoles: <
+}
+consoles {
+  id: "tryserver.chromium.angle"
+  name: "tryserver.chromium.angle"
+  builders {
+    name: "buildbucket/luci.chromium.try/android_angle_deqp_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_angle_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_angle_vk32_deqp_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_angle_vk32_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_angle_vk64_deqp_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/android_angle_vk64_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia-angle-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-angle-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_angle_deqp_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_angle_ozone_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac-angle-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-angle-deqp-rel-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-angle-deqp-rel-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-angle-rel-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-angle-rel-64"
+  }
+  builder_view_only: true
+}
+consoles {
   id: "tryserver.chromium.chromiumos"
   name: "tryserver.chromium.chromiumos"
-  builders: <
+  builders {
+    name: "buildbucket/luci.chromium.try/chromeos-amd64-generic-cfi-thin-lto-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/chromeos-amd64-generic-dbg"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/chromeos-amd64-generic-rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/chromeos-arm-generic-dbg"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/chromeos-arm-generic-rel"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/chromeos-kevin-compile-rel"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/chromeos-kevin-rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-chromeos-amd64-generic"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-chromeos-kevin"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux-chromeos-compile-dbg"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-chromeos-dbg"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux-chromeos-rel"
-  >
+  }
   builder_view_only: true
->
-consoles: <
+}
+consoles {
   id: "tryserver.chromium.dawn"
   name: "tryserver.chromium.dawn"
-  builders: <
+  builders {
     name: "buildbucket/luci.chromium.try/dawn-linux-x64-deps-rel"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/dawn-mac-x64-deps-rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/dawn-try-win10-x64-asan-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/dawn-try-win10-x86-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/dawn-win10-x64-deps-rel"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/dawn-win10-x86-deps-rel"
-  >
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-dawn-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac-dawn-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-dawn-rel"
+  }
   builder_view_only: true
->
-consoles: <
+}
+consoles {
   id: "tryserver.chromium.linux"
   name: "tryserver.chromium.linux"
-  builders: <
+  builders {
+    name: "buildbucket/luci.chromium.try/cast_shell_audio_linux"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/cast_shell_linux"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/chromium_presubmit"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/closure_compilation"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/fuchsia-arm64-cast"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia-compile-x64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia-fyi-arm64-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia-fyi-x64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia-fyi-x64-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/fuchsia-x64-cast"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/fuchsia_arm64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/fuchsia_x64"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-intel-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-intel-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-intel-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-intel-sk-dawn-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-intel-skv"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-skv"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-tsn"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-try-linux-nvidia-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-try-linux-nvidia-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/layout_test_leak_detection"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/leak_detection_linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-annotator-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-autofill-assistant"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-bfcache-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"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-clang-tidy-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-clang-tidy-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-dcheck-off-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-gcc-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-layout-tests-edit-ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-layout-tests-fragment-item"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux-libfuzzer-asan-rel"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux-ozone-rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-perfetto-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux-rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-trusty-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-viz-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-webkit-msan-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-wpt-fyi-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_analysis"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_archive_rel_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_asan_rel_ng"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_cfi_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_asan_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_msan_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_clobber_deterministic"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_clobber_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_compile_dbg_32_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_compile_dbg_ng"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_compile_rel_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_dbg_ng"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_msan_rel_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_tsan_rel_ng"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_ubsan_rel_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_layout_tests_composite_after_paint"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_layout_tests_layout_ng_disabled"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_mojo"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_mojo_chromeos"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_optional_gpu_tests_rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux_upload_clang"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_vr"
-  >
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/network_service_linux"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/tricium-metrics-analysis"
+  }
   builder_view_only: true
->
-consoles: <
+}
+consoles {
   id: "tryserver.chromium.mac"
   name: "tryserver.chromium.mac"
-  builders: <
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-amd-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-amd-pro-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-amd-retina-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-amd-retina-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-amd-retina-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-intel-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-intel-dqp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-intel-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-intel-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-nvidia-retina-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-nvidia-retina-exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-nvidia-retina-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-try-mac-amd-retina-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-try-mac-intel-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-device"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/ios-simulator"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-simulator-code-coverage"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-simulator-cr-recipe"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/ios-simulator-cronet"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-simulator-eg"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/ios-simulator-full-configs"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-simulator-multi-window"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-simulator-noncq"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios13-beta-simulator"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios13-sdk-simulator"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios14-beta-simulator"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios14-sdk-simulator"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac-coverage-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac-osxbeta-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/mac-rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_10.10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_10.12_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_10.13_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_10.14_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_10.15_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_archive_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_asan_rel_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_compile_dbg_ng"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_compile_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_dbg_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/mac_optional_gpu_tests_rel"
-  >
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_upload_clang"
+  }
+  builder_view_only: true
+}
+consoles {
+  id: "tryserver.chromium.swangle"
+  name: "tryserver.chromium.swangle"
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-swangle-chromium-try-x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-swangle-try-tot-angle-x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-swangle-try-tot-angle-x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-swangle-try-tot-swiftshader-x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-swangle-try-tot-swiftshader-x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-swangle-try-x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-swangle-try-x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac-swangle-chromium-try-x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-swangle-chromium-try-x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-swangle-try-tot-angle-x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-swangle-try-tot-angle-x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-swangle-try-tot-swiftshader-x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-swangle-try-tot-swiftshader-x86"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-swangle-try-x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-swangle-try-x86"
+  }
   builder_view_only: true
->
-consoles: <
+}
+consoles {
   id: "tryserver.chromium.win"
   name: "tryserver.chromium.win"
-  builders: <
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-intel-dqp-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-intel-exp-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-intel-rel-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-dbg-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-dqp-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-dx12vk-dbg-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-dx12vk-rel-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-exp-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-rel-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-rel-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-sk-dawn-rel-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-skgl-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-amd-dbg-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-amd-dqp-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-amd-rel-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-nvidia-dqp-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-nvidia-rel-32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-nvidia-rel-64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/gpu-try-win10-nvidia-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-annotator-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-asan"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-celab-try-rel"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/win-libfuzzer-asan-rel"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win10_chromium_x64_dbg_ng"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/win10_chromium_x64_rel_ng"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win10_chromium_x64_rel_ng_exp"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win7-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_archive"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/win_chromium_compile_dbg_ng"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_chromium_compile_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_chromium_dbg_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_chromium_x64_rel_ng"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_mojo"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/win_optional_gpu_tests_rel"
-  >
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_upload_clang"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/win_x64_archive"
+  }
   builder_view_only: true
->
+}
 logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/chromium.svg"
diff --git a/chromium/infra/config/generated/luci-notify.cfg b/chromium/infra/config/generated/luci-notify.cfg
index 1aa8be15828..4f9b8ad769b 100644
--- a/chromium/infra/config/generated/luci-notify.cfg
+++ b/chromium/infra/config/generated/luci-notify.cfg
@@ -4,118 +4,1022 @@
 # For the schema of this file, see ProjectConfig message:
 #   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
 
-notifiers: <
-  notifications: <
+notifiers {
+  notifications {
     on_change: true
-    email: <
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ASAN Debug"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ASAN Release"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ASAN Release Media"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ASan Debug (32-bit x86 with V8-ARM)"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ASan Release (32-bit x86 with V8-ARM)"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ASan Release Media (32-bit x86 with V8-ARM)"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Afl Upload Linux ASan"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ChromiumOS ASAN Release"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
       recipients: "cr-fuchsia+bot@chromium.org"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "Fuchsia ARM64"
     repository: "https://chromium.googlesource.com/chromium/src"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_change: true
-    email: <
+    email {
       recipients: "cr-fuchsia+bot@chromium.org"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "Fuchsia x64"
     repository: "https://chromium.googlesource.com/chromium/src"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Libfuzzer Upload Chrome OS ASan"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Libfuzzer Upload Linux ASan"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Libfuzzer Upload Linux ASan Debug"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Libfuzzer Upload Linux MSan"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Libfuzzer Upload Linux UBSan"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Libfuzzer Upload Linux V8-ARM64 ASan"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Libfuzzer Upload Linux V8-ARM64 ASan Debug"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Libfuzzer Upload Linux32 ASan"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Libfuzzer Upload Linux32 ASan Debug"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Libfuzzer Upload Linux32 V8-ARM ASan"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Libfuzzer Upload Linux32 V8-ARM ASan Debug"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Libfuzzer Upload Mac ASan"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Libfuzzer Upload Windows ASan"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "MSAN Release (chained origins)"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "MSAN Release (no origins)"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Mac ASAN Release"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Mac ASAN Release Media"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "TSAN Debug"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "TSAN Release"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ToTLinux"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ToTLinux (dbg)"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ToTLinuxASan"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ToTLinuxASanLibfuzzer"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ToTLinuxCoverage"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ToTLinuxMSan"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ToTLinuxTSan"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ToTLinuxThinLTO"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "ToTLinuxUBSanVptr"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "UBSan Release"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "UBSan vptr Release"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
     on_change: true
-    email: <
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Win ASan Release"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "chromesec-lkgr-failures@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Win ASan Release Media"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
       recipients: "cronet-bots-observer@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "android-cronet-arm-dbg"
     repository: "https://chromium.googlesource.com/chromium/src"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_change: true
-    email: <
+    email {
       recipients: "cronet-bots-observer@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "android-cronet-arm-rel"
     repository: "https://chromium.googlesource.com/chromium/src"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_change: true
-    email: <
+    email {
       recipients: "cronet-bots-observer@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "android-cronet-arm64-dbg"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "android-cronet-arm64-rel"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "android-cronet-asan-arm-rel"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
     bucket: "ci"
     name: "android-cronet-kitkat-arm-rel"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_change: true
-    email: <
+    email {
       recipients: "cronet-bots-observer@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "android-cronet-lollipop-arm-rel"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "android-cronet-marshmallow-arm64-perf-rel"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "android-cronet-marshmallow-arm64-rel"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "android-cronet-x86-dbg"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
     on_change: true
-    email: <
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "android-cronet-x86-rel"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
       recipients: "cr-fuchsia+bot@chromium.org"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "fuchsia-arm64-cast"
     repository: "https://chromium.googlesource.com/chromium/src"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cr-fuchsia+bot@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "fuchsia-fyi-arm64-rel"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cr-fuchsia+bot@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "fuchsia-fyi-x64-dbg"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cr-fuchsia+bot@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "fuchsia-fyi-x64-rel"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
     on_change: true
-    email: <
+    email {
       recipients: "cr-fuchsia+bot@chromium.org"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "fuchsia-x64-cast"
     repository: "https://chromium.googlesource.com/chromium/src"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cr-fuchsia+bot@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "fuchsia-x64-dbg"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
     on_change: true
-    email: <
+    email {
       recipients: "cronet-bots-observer@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "ios-simulator-cronet"
     repository: "https://chromium.googlesource.com/chromium/src"
-  >
->
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "chromium-component-mapping@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "linux_chromium_component_updater"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cr-fuchsia+bot@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m83"
+    name: "Fuchsia ARM64"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cr-fuchsia+bot@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m83"
+    name: "Fuchsia x64"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci-m83"
+    name: "android-cronet-arm-dbg"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci-m83"
+    name: "android-cronet-arm-rel"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci-m83"
+    name: "android-cronet-kitkat-arm-rel"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci-m83"
+    name: "android-cronet-lollipop-arm-rel"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cr-fuchsia+bot@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m83"
+    name: "fuchsia-arm64-cast"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cr-fuchsia+bot@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m83"
+    name: "fuchsia-x64-cast"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci-m83"
+    name: "ios-simulator-cronet"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cr-fuchsia+bot@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m84"
+    name: "Fuchsia ARM64"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cr-fuchsia+bot@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m84"
+    name: "Fuchsia x64"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci-m84"
+    name: "android-cronet-arm-dbg"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci-m84"
+    name: "android-cronet-arm-rel"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci-m84"
+    name: "android-cronet-kitkat-arm-rel"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci-m84"
+    name: "android-cronet-lollipop-arm-rel"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cr-fuchsia+bot@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m84"
+    name: "fuchsia-arm64-cast"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cr-fuchsia+bot@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci-m84"
+    name: "fuchsia-x64-cast"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_change: true
+    email {
+      recipients: "cronet-bots-observer@google.com"
+    }
+  }
+  builders {
+    bucket: "ci-m84"
+    name: "ios-simulator-cronet"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
diff --git a/chromium/infra/config/generated/luci-scheduler-dev.cfg b/chromium/infra/config/generated/luci-scheduler-dev.cfg
new file mode 100644
index 00000000000..2f6aeb62637
--- /dev/null
+++ b/chromium/infra/config/generated/luci-scheduler-dev.cfg
@@ -0,0 +1,94 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectConfig message:
+#   https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
+
+job {
+  id: "android-lollipop-arm-rel-swarming"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket-dev.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-lollipop-arm-rel-swarming"
+  }
+}
+job {
+  id: "android-marshmallow-arm64-rel-swarming"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket-dev.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-marshmallow-arm64-rel-swarming"
+  }
+}
+job {
+  id: "linux-rel-swarming"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket-dev.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-rel-swarming"
+  }
+}
+job {
+  id: "linux-rel-swarming-staging"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket-dev.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-rel-swarming-staging"
+  }
+}
+job {
+  id: "mac-rel-swarming"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket-dev.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-rel-swarming"
+  }
+}
+job {
+  id: "win-rel-swarming"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket-dev.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-rel-swarming"
+  }
+}
+job {
+  id: "win-rel-swarming-staging"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket-dev.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-rel-swarming-staging"
+  }
+}
+trigger {
+  id: "master-gitiles-trigger"
+  acl_sets: "ci"
+  triggers: "android-lollipop-arm-rel-swarming"
+  triggers: "android-marshmallow-arm64-rel-swarming"
+  triggers: "linux-rel-swarming"
+  triggers: "linux-rel-swarming-staging"
+  triggers: "mac-rel-swarming"
+  triggers: "win-rel-swarming"
+  triggers: "win-rel-swarming-staging"
+  gitiles {
+    repo: "https://chromium.googlesource.com/chromium/src"
+    refs: "regexp:refs/heads/master"
+  }
+}
+acl_sets {
+  name: "ci"
+  acls {
+    role: OWNER
+    granted_to: "group:project-chromium-admins"
+  }
+  acls {
+    granted_to: "group:all"
+  }
+}
diff --git a/chromium/infra/config/generated/luci-scheduler.cfg b/chromium/infra/config/generated/luci-scheduler.cfg
index 9b6204879dd..1f127bed8db 100644
--- a/chromium/infra/config/generated/luci-scheduler.cfg
+++ b/chromium/infra/config/generated/luci-scheduler.cfg
@@ -4,1037 +4,11884 @@
 # For the schema of this file, see ProjectConfig message:
 #   https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
 
-job: <
+job {
+  id: "ASAN Debug"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ASAN Debug"
+  }
+}
+job {
+  id: "ASAN Release"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 5
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ASAN Release"
+  }
+}
+job {
+  id: "ASAN Release Media"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ASAN Release Media"
+  }
+}
+job {
+  id: "ASan Debug (32-bit x86 with V8-ARM)"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ASan Debug (32-bit x86 with V8-ARM)"
+  }
+}
+job {
+  id: "ASan Release (32-bit x86 with V8-ARM)"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ASan Release (32-bit x86 with V8-ARM)"
+  }
+}
+job {
+  id: "ASan Release Media (32-bit x86 with V8-ARM)"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ASan Release Media (32-bit x86 with V8-ARM)"
+  }
+}
+job {
+  id: "Afl Upload Linux ASan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Afl Upload Linux ASan"
+  }
+}
+job {
+  id: "Android ASAN (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android ASAN (dbg)"
+  }
+}
+job {
+  id: "Android CFI"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android CFI"
+  }
+}
+job {
+  id: "Android FYI 32 Vk Release (Pixel 2)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI 32 Vk Release (Pixel 2)"
+  }
+}
+job {
+  id: "Android FYI 32 dEQP Vk Release (Pixel 2)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI 32 dEQP Vk Release (Pixel 2)"
+  }
+}
+job {
+  id: "Android FYI 64 Perf (Pixel 2)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI 64 Perf (Pixel 2)"
+  }
+}
+job {
+  id: "Android FYI 64 Vk Release (Pixel 2)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI 64 Vk Release (Pixel 2)"
+  }
+}
+job {
+  id: "Android FYI 64 dEQP Vk Release (Pixel 2)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI 64 dEQP Vk Release (Pixel 2)"
+  }
+}
+job {
+  id: "Android FYI Release (NVIDIA Shield TV)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (NVIDIA Shield TV)"
+  }
+}
+job {
+  id: "Android FYI Release (Nexus 5)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 5)"
+  }
+}
+job {
+  id: "Android FYI Release (Nexus 5X)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 5X)"
+  }
+}
+job {
+  id: "Android FYI Release (Nexus 6)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 6)"
+  }
+}
+job {
+  id: "Android FYI Release (Nexus 6P)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 6P)"
+  }
+}
+job {
+  id: "Android FYI Release (Nexus 9)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 9)"
+  }
+}
+job {
+  id: "Android FYI Release (Pixel 2)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Pixel 2)"
+  }
+}
+job {
+  id: "Android FYI SkiaRenderer GL (Nexus 5X)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI SkiaRenderer GL (Nexus 5X)"
+  }
+}
+job {
+  id: "Android FYI SkiaRenderer Vulkan (Pixel 2)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI SkiaRenderer Vulkan (Pixel 2)"
+  }
+}
+job {
+  id: "Android FYI dEQP Release (Nexus 5X)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI dEQP Release (Nexus 5X)"
+  }
+}
+job {
   id: "Android Release (Nexus 5X)"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Android Release (Nexus 5X)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Android WebLayer P FYI (rel)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebLayer P FYI (rel)"
+  }
+}
+job {
+  id: "Android WebView L (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebView L (dbg)"
+  }
+}
+job {
   id: "Android WebView M (dbg)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Android WebView M (dbg)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Android WebView N (dbg)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Android WebView N (dbg)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Android WebView O (dbg)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Android WebView O (dbg)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Android WebView P (dbg)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Android WebView P (dbg)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Android WebView P Blink-CORS FYI (rel)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebView P Blink-CORS FYI (rel)"
+  }
+}
+job {
+  id: "Android WebView P FYI (rel)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebView P FYI (rel)"
+  }
+}
+job {
   id: "Android arm Builder (dbg)"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Android arm Builder (dbg)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Android arm64 Builder (dbg)"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Android arm64 Builder (dbg)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Android x64 Builder (dbg)"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Android x64 Builder (dbg)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Android x86 Builder (dbg)"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Android x86 Builder (dbg)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "CFI Linux CF"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "CFI Linux CF"
+  }
+}
+job {
+  id: "CFI Linux ToT"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "CFI Linux ToT"
+  }
+}
+job {
   id: "Cast Android (dbg)"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Cast Android (dbg)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Cast Audio Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Cast Audio Linux"
+  }
+}
+job {
   id: "Cast Linux"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Cast Linux"
-  >
->
-job: <
+  }
+}
+job {
+  id: "ChromeOS FYI Release (amd64-generic)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ChromeOS FYI Release (amd64-generic)"
+  }
+}
+job {
+  id: "ChromeOS FYI Release (kevin)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ChromeOS FYI Release (kevin)"
+  }
+}
+job {
+  id: "Chromium Android ARM 32-bit Goma RBE Staging"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Android ARM 32-bit Goma RBE Staging"
+  }
+}
+job {
+  id: "Chromium Android ARM 32-bit Goma RBE ToT"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Android ARM 32-bit Goma RBE ToT"
+  }
+}
+job {
+  id: "Chromium Android ARM 32-bit Goma RBE ToT (ATS)"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Android ARM 32-bit Goma RBE ToT (ATS)"
+  }
+}
+job {
+  id: "Chromium Linux Goma RBE Staging"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Linux Goma RBE Staging"
+  }
+}
+job {
+  id: "Chromium Linux Goma RBE Staging (clobber)"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Linux Goma RBE Staging (clobber)"
+  }
+}
+job {
+  id: "Chromium Linux Goma RBE Staging (dbg)"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Linux Goma RBE Staging (dbg)"
+  }
+}
+job {
+  id: "Chromium Linux Goma RBE Staging (dbg) (clobber)"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Linux Goma RBE Staging (dbg) (clobber)"
+  }
+}
+job {
+  id: "Chromium Linux Goma RBE ToT"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Linux Goma RBE ToT"
+  }
+}
+job {
+  id: "Chromium Linux Goma RBE ToT (ATS)"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Linux Goma RBE ToT (ATS)"
+  }
+}
+job {
+  id: "Chromium Linux Goma Staging"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Linux Goma Staging"
+  }
+}
+job {
+  id: "Chromium Mac Goma RBE Staging"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Mac Goma RBE Staging"
+  }
+}
+job {
+  id: "Chromium Mac Goma RBE Staging (clobber)"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Mac Goma RBE Staging (clobber)"
+  }
+}
+job {
+  id: "Chromium Mac Goma RBE Staging (dbg)"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Mac Goma RBE Staging (dbg)"
+  }
+}
+job {
+  id: "Chromium Mac Goma RBE ToT"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Mac Goma RBE ToT"
+  }
+}
+job {
+  id: "Chromium Mac Goma Staging"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Mac Goma Staging"
+  }
+}
+job {
+  id: "Chromium Win Goma RBE Staging"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Win Goma RBE Staging"
+  }
+}
+job {
+  id: "Chromium Win Goma RBE Staging (clobber)"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Win Goma RBE Staging (clobber)"
+  }
+}
+job {
+  id: "Chromium Win Goma RBE ToT"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium Win Goma RBE ToT"
+  }
+}
+job {
+  id: "Chromium iOS Goma RBE ToT"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Chromium iOS Goma RBE ToT"
+  }
+}
+job {
+  id: "ChromiumOS ASAN Release"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 6
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ChromiumOS ASAN Release"
+  }
+}
+job {
+  id: "Closure Compilation Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Closure Compilation Linux"
+  }
+}
+job {
+  id: "CrWinAsan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "CrWinAsan"
+  }
+}
+job {
+  id: "CrWinAsan(dll)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "CrWinAsan(dll)"
+  }
+}
+job {
+  id: "CrWinGomaStaging"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "CrWinGomaStaging"
+  }
+}
+job {
+  id: "Dawn Linux x64 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Linux x64 Builder"
+  }
+}
+job {
   id: "Dawn Linux x64 DEPS Builder"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Dawn Linux x64 DEPS Builder"
-  >
->
-job: <
+  }
+}
+job {
   id: "Dawn Linux x64 DEPS Release (Intel HD 630)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Dawn Linux x64 DEPS Release (Intel HD 630)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Dawn Linux x64 DEPS Release (NVIDIA)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Dawn Linux x64 DEPS Release (NVIDIA)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Dawn Linux x64 Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  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)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Linux x64 Release (NVIDIA)"
+  }
+}
+job {
+  id: "Dawn Mac x64 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 Builder"
+  }
+}
+job {
   id: "Dawn Mac x64 DEPS Builder"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Dawn Mac x64 DEPS Builder"
-  >
->
-job: <
+  }
+}
+job {
   id: "Dawn Mac x64 DEPS Release (AMD)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Dawn Mac x64 DEPS Release (AMD)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Dawn Mac x64 DEPS Release (Intel)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Dawn Mac x64 DEPS Release (Intel)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Dawn Mac x64 Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 Release (AMD)"
+  }
+}
+job {
+  id: "Dawn Mac x64 Release (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 Release (Intel)"
+  }
+}
+job {
+  id: "Dawn Win10 x64 ASAN Release"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 ASAN Release"
+  }
+}
+job {
+  id: "Dawn Win10 x64 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 Builder"
+  }
+}
+job {
   id: "Dawn Win10 x64 DEPS Builder"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Dawn Win10 x64 DEPS Builder"
-  >
->
-job: <
+  }
+}
+job {
   id: "Dawn Win10 x64 DEPS Release (Intel HD 630)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Dawn Win10 x64 DEPS Release (Intel HD 630)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Dawn Win10 x64 DEPS Release (NVIDIA)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Dawn Win10 x64 DEPS Release (NVIDIA)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Dawn Win10 x64 Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  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)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 Release (NVIDIA)"
+  }
+}
+job {
+  id: "Dawn Win10 x86 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x86 Builder"
+  }
+}
+job {
   id: "Dawn Win10 x86 DEPS Builder"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Dawn Win10 x86 DEPS Builder"
-  >
->
-job: <
+  }
+}
+job {
   id: "Dawn Win10 x86 DEPS Release (Intel HD 630)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Dawn Win10 x86 DEPS Release (Intel HD 630)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Dawn Win10 x86 DEPS Release (NVIDIA)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Dawn Win10 x86 DEPS Release (NVIDIA)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Dawn Win10 x86 Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  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)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x86 Release (NVIDIA)"
+  }
+}
+job {
+  id: "Deterministic Android"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Deterministic Android"
+  }
+}
+job {
+  id: "Deterministic Android (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Deterministic Android (dbg)"
+  }
+}
+job {
+  id: "Deterministic Fuchsia (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Deterministic Fuchsia (dbg)"
+  }
+}
+job {
+  id: "Deterministic Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Deterministic Linux"
+  }
+}
+job {
+  id: "Deterministic Linux (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Deterministic Linux (dbg)"
+  }
+}
+job {
   id: "Fuchsia ARM64"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Fuchsia ARM64"
-  >
->
-job: <
+  }
+}
+job {
   id: "Fuchsia x64"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Fuchsia x64"
-  >
->
-job: <
+  }
+}
+job {
+  id: "GPU FYI Linux Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Linux Builder"
+  }
+}
+job {
+  id: "GPU FYI Linux Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Linux Builder (dbg)"
+  }
+}
+job {
+  id: "GPU FYI Linux Ozone Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Linux Ozone Builder"
+  }
+}
+job {
+  id: "GPU FYI Linux dEQP Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Linux dEQP Builder"
+  }
+}
+job {
+  id: "GPU FYI Mac Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Mac Builder"
+  }
+}
+job {
+  id: "GPU FYI Mac Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Mac Builder (dbg)"
+  }
+}
+job {
+  id: "GPU FYI Mac dEQP Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Mac dEQP Builder"
+  }
+}
+job {
+  id: "GPU FYI Perf Android 64 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Perf Android 64 Builder"
+  }
+}
+job {
+  id: "GPU FYI Win Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win Builder"
+  }
+}
+job {
+  id: "GPU FYI Win Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win Builder (dbg)"
+  }
+}
+job {
+  id: "GPU FYI Win dEQP Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win dEQP Builder"
+  }
+}
+job {
+  id: "GPU FYI Win x64 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win x64 Builder"
+  }
+}
+job {
+  id: "GPU FYI Win x64 Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win x64 Builder (dbg)"
+  }
+}
+job {
+  id: "GPU FYI Win x64 DX12 Vulkan Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win x64 DX12 Vulkan Builder"
+  }
+}
+job {
+  id: "GPU FYI Win x64 DX12 Vulkan Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win x64 DX12 Vulkan Builder (dbg)"
+  }
+}
+job {
+  id: "GPU FYI Win x64 dEQP Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win x64 dEQP Builder"
+  }
+}
+job {
+  id: "GPU FYI XR Win x64 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI XR Win x64 Builder"
+  }
+}
+job {
   id: "GPU Linux Builder"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "GPU Linux Builder"
-  >
->
-job: <
+  }
+}
+job {
+  id: "GPU Linux Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU Linux Builder (dbg)"
+  }
+}
+job {
   id: "GPU Mac Builder"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "GPU Mac Builder"
-  >
->
-job: <
+  }
+}
+job {
+  id: "GPU Mac Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU Mac Builder (dbg)"
+  }
+}
+job {
   id: "GPU Win x64 Builder"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "GPU Win x64 Builder"
-  >
->
-job: <
+  }
+}
+job {
+  id: "GPU Win x64 Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU Win x64 Builder (dbg)"
+  }
+}
+job {
+  id: "Leak Detection Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Leak Detection Linux"
+  }
+}
+job {
+  id: "Libfuzzer Upload Chrome OS ASan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 3
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Chrome OS ASan"
+  }
+}
+job {
+  id: "Libfuzzer Upload Linux ASan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 5
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux ASan"
+  }
+}
+job {
+  id: "Libfuzzer Upload Linux ASan Debug"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 5
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux ASan Debug"
+  }
+}
+job {
+  id: "Libfuzzer Upload Linux MSan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 5
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux MSan"
+  }
+}
+job {
+  id: "Libfuzzer Upload Linux UBSan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 5
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux UBSan"
+  }
+}
+job {
+  id: "Libfuzzer Upload Linux V8-ARM64 ASan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux V8-ARM64 ASan"
+  }
+}
+job {
+  id: "Libfuzzer Upload Linux V8-ARM64 ASan Debug"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux V8-ARM64 ASan Debug"
+  }
+}
+job {
+  id: "Libfuzzer Upload Linux32 ASan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 3
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux32 ASan"
+  }
+}
+job {
+  id: "Libfuzzer Upload Linux32 ASan Debug"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 3
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux32 ASan Debug"
+  }
+}
+job {
+  id: "Libfuzzer Upload Linux32 V8-ARM ASan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux32 V8-ARM ASan"
+  }
+}
+job {
+  id: "Libfuzzer Upload Linux32 V8-ARM ASan Debug"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux32 V8-ARM ASan Debug"
+  }
+}
+job {
+  id: "Libfuzzer Upload Mac ASan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Mac ASan"
+  }
+}
+job {
+  id: "Libfuzzer Upload Windows ASan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 3
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Windows ASan"
+  }
+}
+job {
   id: "Linux ASan LSan Builder"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Linux ASan LSan Builder"
-  >
->
-job: <
+  }
+}
+job {
   id: "Linux ASan LSan Tests (1)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Linux ASan LSan Tests (1)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Linux ASan Tests (sandboxed)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Linux ASan Tests (sandboxed)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Linux Builder"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Linux Builder"
-  >
->
-job: <
+  }
+}
+job {
   id: "Linux Builder (dbg)"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Linux Builder (dbg)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Linux Builder (dbg)(32)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Builder (dbg)(32)"
+  }
+}
+job {
+  id: "Linux Builder Goma Canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Linux Builder Goma Canary"
+  }
+}
+job {
+  id: "Linux Builder Goma Latest Client"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Linux Builder Goma Latest Client"
+  }
+}
+job {
+  id: "Linux Builder Goma RBE Canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Linux Builder Goma RBE Canary"
+  }
+}
+job {
+  id: "Linux Builder Goma RBE Latest Client"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Linux Builder Goma RBE Latest Client"
+  }
+}
+job {
+  id: "Linux CFI"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux CFI"
+  }
+}
+job {
+  id: "Linux Chromium OS ASan LSan Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Chromium OS ASan LSan Builder"
+  }
+}
+job {
+  id: "Linux Chromium OS ASan LSan Tests (1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Chromium OS ASan LSan Tests (1)"
+  }
+}
+job {
+  id: "Linux ChromiumOS Full"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux ChromiumOS Full"
+  }
+}
+job {
+  id: "Linux ChromiumOS MSan Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux ChromiumOS MSan Builder"
+  }
+}
+job {
+  id: "Linux ChromiumOS MSan Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux ChromiumOS MSan Tests"
+  }
+}
+job {
+  id: "Linux Debug (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Debug (NVIDIA)"
+  }
+}
+job {
+  id: "Linux FYI Debug (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Debug (NVIDIA)"
+  }
+}
+job {
+  id: "Linux FYI Experimental Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Experimental Release (Intel HD 630)"
+  }
+}
+job {
+  id: "Linux FYI Experimental Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Experimental Release (NVIDIA)"
+  }
+}
+job {
+  id: "Linux FYI GPU TSAN Release"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI GPU TSAN Release"
+  }
+}
+job {
+  id: "Linux FYI Ozone (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Ozone (Intel)"
+  }
+}
+job {
+  id: "Linux FYI Release (AMD R7 240)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Release (AMD R7 240)"
+  }
+}
+job {
+  id: "Linux FYI Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Release (Intel HD 630)"
+  }
+}
+job {
+  id: "Linux FYI Release (Intel UHD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Release (Intel UHD 630)"
+  }
+}
+job {
+  id: "Linux FYI Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Release (NVIDIA)"
+  }
+}
+job {
+  id: "Linux FYI SkiaRenderer Dawn Release (Intel HD 630)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI SkiaRenderer Dawn Release (Intel HD 630)"
+  }
+}
+job {
+  id: "Linux FYI SkiaRenderer Vulkan (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI SkiaRenderer Vulkan (Intel HD 630)"
+  }
+}
+job {
+  id: "Linux FYI SkiaRenderer Vulkan (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI SkiaRenderer Vulkan (NVIDIA)"
+  }
+}
+job {
+  id: "Linux FYI dEQP Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI dEQP Release (Intel HD 630)"
+  }
+}
+job {
+  id: "Linux FYI dEQP Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI dEQP Release (NVIDIA)"
+  }
+}
+job {
+  id: "Linux MSan Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux MSan Builder"
+  }
+}
+job {
+  id: "Linux MSan Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux MSan Tests"
+  }
+}
+job {
   id: "Linux Ozone Tester (Headless)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Linux Ozone Tester (Headless)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Linux Ozone Tester (Wayland)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Linux Ozone Tester (Wayland)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Linux Ozone Tester (X11)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Linux Ozone Tester (X11)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Linux Release (NVIDIA)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Linux Release (NVIDIA)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Linux TSan Builder"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Linux TSan Builder"
-  >
->
-job: <
+  }
+}
+job {
   id: "Linux TSan Tests"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Linux TSan Tests"
-  >
->
-job: <
+  }
+}
+job {
   id: "Linux Tests"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Linux Tests"
-  >
->
-job: <
+  }
+}
+job {
   id: "Linux Tests (dbg)(1)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Linux Tests (dbg)(1)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Linux Viz"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Viz"
+  }
+}
+job {
+  id: "Linux remote_run Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux remote_run Builder"
+  }
+}
+job {
+  id: "Linux remote_run Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux remote_run Tester"
+  }
+}
+job {
+  id: "Lollipop Phone Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Lollipop Phone Tester"
+  }
+}
+job {
+  id: "Lollipop Tablet Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Lollipop Tablet Tester"
+  }
+}
+job {
+  id: "MSAN Release (chained origins)"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "MSAN Release (chained origins)"
+  }
+}
+job {
+  id: "MSAN Release (no origins)"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "MSAN Release (no origins)"
+  }
+}
+job {
+  id: "Mac ASAN Release"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 2
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac ASAN Release"
+  }
+}
+job {
+  id: "Mac ASAN Release Media"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 2
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac ASAN Release Media"
+  }
+}
+job {
+  id: "Mac ASan 64 Builder"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 2
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac ASan 64 Builder"
+  }
+}
+job {
+  id: "Mac ASan 64 Tests (1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac ASan 64 Tests (1)"
+  }
+}
+job {
   id: "Mac Builder"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Mac Builder"
-  >
->
-job: <
+  }
+}
+job {
   id: "Mac Builder (dbg)"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Mac Builder (dbg)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Mac Builder (dbg) Goma Canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Mac Builder (dbg) Goma Canary"
+  }
+}
+job {
+  id: "Mac Builder (dbg) Goma Canary (clobber)"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Mac Builder (dbg) Goma Canary (clobber)"
+  }
+}
+job {
+  id: "Mac Builder (dbg) Goma Latest Client"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Mac Builder (dbg) Goma Latest Client"
+  }
+}
+job {
+  id: "Mac Builder (dbg) Goma Latest Client (clobber)"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Mac Builder (dbg) Goma Latest Client (clobber)"
+  }
+}
+job {
+  id: "Mac Builder (dbg) Goma RBE Canary (clobber)"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Mac Builder (dbg) Goma RBE Canary (clobber)"
+  }
+}
+job {
+  id: "Mac Builder (dbg) Goma RBE Latest Client (clobber)"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Mac Builder (dbg) Goma RBE Latest Client (clobber)"
+  }
+}
+job {
+  id: "Mac Builder Goma Canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Mac Builder Goma Canary"
+  }
+}
+job {
+  id: "Mac Builder Goma Latest Client"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Mac Builder Goma Latest Client"
+  }
+}
+job {
+  id: "Mac Builder Next"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Builder Next"
+  }
+}
+job {
+  id: "Mac Debug (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Debug (Intel)"
+  }
+}
+job {
+  id: "Mac FYI Debug (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Debug (Intel)"
+  }
+}
+job {
+  id: "Mac FYI Experimental Release (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Experimental Release (Intel)"
+  }
+}
+job {
+  id: "Mac FYI Experimental Retina Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Experimental Retina Release (AMD)"
+  }
+}
+job {
+  id: "Mac FYI Experimental Retina Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Experimental Retina Release (NVIDIA)"
+  }
+}
+job {
+  id: "Mac FYI GPU ASAN Release"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI GPU ASAN Release"
+  }
+}
+job {
+  id: "Mac FYI Release (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Release (Intel)"
+  }
+}
+job {
+  id: "Mac FYI Retina Debug (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Retina Debug (AMD)"
+  }
+}
+job {
+  id: "Mac FYI Retina Debug (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Retina Debug (NVIDIA)"
+  }
+}
+job {
+  id: "Mac FYI Retina Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Retina Release (AMD)"
+  }
+}
+job {
+  id: "Mac FYI Retina Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Retina Release (NVIDIA)"
+  }
+}
+job {
+  id: "Mac FYI dEQP Release AMD"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI dEQP Release AMD"
+  }
+}
+job {
+  id: "Mac FYI dEQP Release Intel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI dEQP Release Intel"
+  }
+}
+job {
+  id: "Mac Pro FYI Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Pro FYI Release (AMD)"
+  }
+}
+job {
   id: "Mac Release (Intel)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Mac Release (Intel)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Mac Retina Debug (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Retina Debug (AMD)"
+  }
+}
+job {
   id: "Mac Retina Release (AMD)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Mac Retina Release (AMD)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Mac deterministic"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac deterministic"
+  }
+}
+job {
+  id: "Mac deterministic (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac deterministic (dbg)"
+  }
+}
+job {
   id: "Mac10.10 Tests"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Mac10.10 Tests"
-  >
->
-job: <
+  }
+}
+job {
   id: "Mac10.11 Tests"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Mac10.11 Tests"
-  >
->
-job: <
+  }
+}
+job {
   id: "Mac10.12 Tests"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Mac10.12 Tests"
-  >
->
-job: <
+  }
+}
+job {
   id: "Mac10.13 Tests"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Mac10.13 Tests"
-  >
->
-job: <
+  }
+}
+job {
   id: "Mac10.13 Tests (dbg)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Mac10.13 Tests (dbg)"
-  >
->
-job: <
+  }
+}
+job {
   id: "Mac10.14 Tests"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Mac10.14 Tests"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Mac10.15 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.15 Tests"
+  }
+}
+job {
   id: "Marshmallow 64 bit Tester"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Marshmallow 64 bit Tester"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Marshmallow Tablet Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Marshmallow Tablet Tester"
+  }
+}
+job {
+  id: "Mojo Android"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mojo Android"
+  }
+}
+job {
+  id: "Mojo ChromiumOS"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mojo ChromiumOS"
+  }
+}
+job {
+  id: "Mojo Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mojo Linux"
+  }
+}
+job {
+  id: "Mojo Windows"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mojo Windows"
+  }
+}
+job {
+  id: "Network Service Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Network Service Linux"
+  }
+}
+job {
   id: "Nougat Phone Tester"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Nougat Phone Tester"
-  >
->
-job: <
+  }
+}
+job {
   id: "Oreo Phone Tester"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Oreo Phone Tester"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Site Isolation Android"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Site Isolation Android"
+  }
+}
+job {
+  id: "TSAN Debug"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "TSAN Debug"
+  }
+}
+job {
+  id: "TSAN Release"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 3
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "TSAN Release"
+  }
+}
+job {
+  id: "ToTAndroid"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTAndroid"
+  }
+}
+job {
+  id: "ToTAndroid (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTAndroid (dbg)"
+  }
+}
+job {
+  id: "ToTAndroid x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTAndroid x64"
+  }
+}
+job {
+  id: "ToTAndroid64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTAndroid64"
+  }
+}
+job {
+  id: "ToTAndroidASan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTAndroidASan"
+  }
+}
+job {
+  id: "ToTAndroidCFI"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTAndroidCFI"
+  }
+}
+job {
+  id: "ToTAndroidOfficial"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTAndroidOfficial"
+  }
+}
+job {
+  id: "ToTLinux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinux"
+  }
+}
+job {
+  id: "ToTLinux (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinux (dbg)"
+  }
+}
+job {
+  id: "ToTLinuxASan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinuxASan"
+  }
+}
+job {
+  id: "ToTLinuxASanLibfuzzer"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinuxASanLibfuzzer"
+  }
+}
+job {
+  id: "ToTLinuxCoverage"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinuxCoverage"
+  }
+}
+job {
+  id: "ToTLinuxMSan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinuxMSan"
+  }
+}
+job {
+  id: "ToTLinuxTSan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinuxTSan"
+  }
+}
+job {
+  id: "ToTLinuxThinLTO"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinuxThinLTO"
+  }
+}
+job {
+  id: "ToTLinuxUBSanVptr"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinuxUBSanVptr"
+  }
+}
+job {
+  id: "ToTMac"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTMac"
+  }
+}
+job {
+  id: "ToTMac (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTMac (dbg)"
+  }
+}
+job {
+  id: "ToTMacASan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTMacASan"
+  }
+}
+job {
+  id: "ToTMacCoverage"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTMacCoverage"
+  }
+}
+job {
+  id: "ToTWin(dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTWin(dbg)"
+  }
+}
+job {
+  id: "ToTWin(dll)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTWin(dll)"
+  }
+}
+job {
+  id: "ToTWin64(dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTWin64(dbg)"
+  }
+}
+job {
+  id: "ToTWin64(dll)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTWin64(dll)"
+  }
+}
+job {
+  id: "ToTWinASanLibfuzzer"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTWinASanLibfuzzer"
+  }
+}
+job {
+  id: "ToTWinCFI"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTWinCFI"
+  }
+}
+job {
+  id: "ToTWinCFI64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTWinCFI64"
+  }
+}
+job {
+  id: "ToTiOS"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTiOS"
+  }
+}
+job {
+  id: "ToTiOSDevice"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTiOSDevice"
+  }
+}
+job {
+  id: "UBSan Release"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "UBSan Release"
+  }
+}
+job {
+  id: "UBSan vptr Release"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "UBSan vptr Release"
+  }
+}
+job {
+  id: "UBSanVptr Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "UBSanVptr Linux"
+  }
+}
+job {
   id: "VR Linux"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "VR Linux"
-  >
->
-job: <
+  }
+}
+job {
+  id: "WebKit Linux ASAN"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "WebKit Linux ASAN"
+  }
+}
+job {
+  id: "WebKit Linux Leak"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "WebKit Linux Leak"
+  }
+}
+job {
+  id: "WebKit Linux MSAN"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "WebKit Linux MSAN"
+  }
+}
+job {
   id: "WebKit Mac10.13 (retina)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "WebKit Mac10.13 (retina)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "WebKit Win10"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "WebKit Win10"
+  }
+}
+job {
+  id: "WebRTC Chromium Android Builder"
+  acl_sets: "webrtc"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Android Builder"
+  }
+}
+job {
+  id: "WebRTC Chromium Android Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "webrtc"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Android Tester"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Android Builder"
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Android Builder"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Android Builder (dbg)"
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Android Builder (dbg)"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Android Builder ARM64 (dbg)"
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Android Builder ARM64 (dbg)"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Android Tests (dbg) (L Nexus5)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Android Tests (dbg) (L Nexus5)"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Android Tests (dbg) (M Nexus5X)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Android Tests (dbg) (M Nexus5X)"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Linux Builder"
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Linux Builder"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Linux Builder (dbg)"
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Linux Builder (dbg)"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Linux Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Linux Tester"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Mac Builder"
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Mac Builder"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Mac Builder (dbg)"
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Mac Builder (dbg)"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Mac Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Mac Tester"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Win Builder"
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Win Builder"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Win Builder (dbg)"
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Win Builder (dbg)"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Win10 Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Win10 Tester"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Win7 Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Win7 Tester"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI Win8 Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI Win8 Tester"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI ios-device"
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI ios-device"
+  }
+}
+job {
+  id: "WebRTC Chromium FYI ios-simulator"
+  acl_sets: "webrtc.fyi"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc.fyi"
+    builder: "WebRTC Chromium FYI ios-simulator"
+  }
+}
+job {
+  id: "WebRTC Chromium Linux Builder"
+  acl_sets: "webrtc"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Linux Builder"
+  }
+}
+job {
+  id: "WebRTC Chromium Linux Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "webrtc"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Linux Tester"
+  }
+}
+job {
+  id: "WebRTC Chromium Mac Builder"
+  acl_sets: "webrtc"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Mac Builder"
+  }
+}
+job {
+  id: "WebRTC Chromium Mac Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "webrtc"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Mac Tester"
+  }
+}
+job {
+  id: "WebRTC Chromium Win Builder"
+  acl_sets: "webrtc"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Win Builder"
+  }
+}
+job {
+  id: "WebRTC Chromium Win10 Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "webrtc"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Win10 Tester"
+  }
+}
+job {
+  id: "WebRTC Chromium Win7 Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "webrtc"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Win7 Tester"
+  }
+}
+job {
+  id: "WebRTC Chromium Win8 Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "webrtc"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Win8 Tester"
+  }
+}
+job {
+  id: "Win 10 Fast Ring"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win 10 Fast Ring"
+  }
+}
+job {
   id: "Win 7 Tests x64 (1)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Win 7 Tests x64 (1)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Win ASan Release"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 7
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win ASan Release"
+  }
+}
+job {
+  id: "Win ASan Release Media"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 6
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win ASan Release Media"
+  }
+}
+job {
+  id: "Win Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win Builder"
+  }
+}
+job {
   id: "Win Builder (dbg)"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Win Builder (dbg)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Win Builder (dbg) Goma Canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Win Builder (dbg) Goma Canary"
+  }
+}
+job {
+  id: "Win Builder (dbg) Goma Latest Client"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Win Builder (dbg) Goma Latest Client"
+  }
+}
+job {
+  id: "Win Builder (dbg) Goma RBE Latest Client"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Win Builder (dbg) Goma RBE Latest Client"
+  }
+}
+job {
+  id: "Win Builder Goma Canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Win Builder Goma Canary"
+  }
+}
+job {
+  id: "Win Builder Goma Latest Client"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Win Builder Goma Latest Client"
+  }
+}
+job {
+  id: "Win Builder Goma RBE Latest Client"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Win Builder Goma RBE Latest Client"
+  }
+}
+job {
   id: "Win x64 Builder"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Win x64 Builder"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Win x64 Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win x64 Builder (dbg)"
+  }
+}
+job {
+  id: "Win10 FYI x64 DX12 Vulkan Debug (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 DX12 Vulkan Debug (NVIDIA)"
+  }
+}
+job {
+  id: "Win10 FYI x64 DX12 Vulkan Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 DX12 Vulkan Release (NVIDIA)"
+  }
+}
+job {
+  id: "Win10 FYI x64 Debug (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Debug (NVIDIA)"
+  }
+}
+job {
+  id: "Win10 FYI x64 Exp Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Exp Release (Intel HD 630)"
+  }
+}
+job {
+  id: "Win10 FYI x64 Exp Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Exp Release (NVIDIA)"
+  }
+}
+job {
+  id: "Win10 FYI x64 Release (AMD RX 550)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Release (AMD RX 550)"
+  }
+}
+job {
+  id: "Win10 FYI x64 Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Release (Intel HD 630)"
+  }
+}
+job {
+  id: "Win10 FYI x64 Release (Intel UHD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Release (Intel UHD 630)"
+  }
+}
+job {
+  id: "Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)"
+  }
+}
+job {
+  id: "Win10 FYI x64 Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Release (NVIDIA)"
+  }
+}
+job {
+  id: "Win10 FYI x64 Release XR Perf (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Release XR Perf (NVIDIA)"
+  }
+}
+job {
+  id: "Win10 FYI x64 SkiaRenderer Dawn Release (NVIDIA)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 SkiaRenderer Dawn Release (NVIDIA)"
+  }
+}
+job {
+  id: "Win10 FYI x64 SkiaRenderer GL (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 SkiaRenderer GL (NVIDIA)"
+  }
+}
+job {
+  id: "Win10 FYI x64 dEQP Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 dEQP Release (Intel HD 630)"
+  }
+}
+job {
+  id: "Win10 FYI x64 dEQP Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 dEQP Release (NVIDIA)"
+  }
+}
+job {
+  id: "Win10 FYI x86 Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x86 Release (NVIDIA)"
+  }
+}
+job {
   id: "Win10 Tests x64"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Win10 Tests x64"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Win10 Tests x64 (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 Tests x64 (dbg)"
+  }
+}
+job {
   id: "Win10 Tests x64 1803"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Win10 Tests x64 1803"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Win10 x64 Debug (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 x64 Debug (NVIDIA)"
+  }
+}
+job {
   id: "Win10 x64 Release (NVIDIA)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Win10 x64 Release (NVIDIA)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Win7 (32) Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 (32) Tests"
+  }
+}
+job {
+  id: "Win7 Builder (dbg) Goma Canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Win7 Builder (dbg) Goma Canary"
+  }
+}
+job {
+  id: "Win7 Builder (dbg) Goma Latest Client"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Win7 Builder (dbg) Goma Latest Client"
+  }
+}
+job {
+  id: "Win7 Builder Goma Canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Win7 Builder Goma Canary"
+  }
+}
+job {
+  id: "Win7 Builder Goma Latest Client"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "Win7 Builder Goma Latest Client"
+  }
+}
+job {
+  id: "Win7 FYI Debug (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI Debug (AMD)"
+  }
+}
+job {
+  id: "Win7 FYI Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI Release (AMD)"
+  }
+}
+job {
+  id: "Win7 FYI Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI Release (NVIDIA)"
+  }
+}
+job {
+  id: "Win7 FYI dEQP Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI dEQP Release (AMD)"
+  }
+}
+job {
+  id: "Win7 FYI x64 Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI x64 Release (NVIDIA)"
+  }
+}
+job {
+  id: "Win7 FYI x64 dEQP Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI x64 dEQP Release (NVIDIA)"
+  }
+}
+job {
+  id: "Win7 Tests (1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 Tests (1)"
+  }
+}
+job {
   id: "Win7 Tests (dbg)(1)"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "Win7 Tests (dbg)(1)"
-  >
->
-job: <
+  }
+}
+job {
+  id: "Windows deterministic"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Windows deterministic"
+  }
+}
+job {
+  id: "android-10-arm64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-10-arm64-rel"
+  }
+}
+job {
+  id: "android-archive-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-archive-dbg"
+  }
+}
+job {
+  id: "android-archive-dbg-goma-canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "android-archive-dbg-goma-canary"
+  }
+}
+job {
+  id: "android-archive-dbg-goma-latest"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "android-archive-dbg-goma-latest"
+  }
+}
+job {
+  id: "android-archive-dbg-goma-rbe-ats-canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "android-archive-dbg-goma-rbe-ats-canary"
+  }
+}
+job {
+  id: "android-archive-dbg-goma-rbe-ats-latest"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "android-archive-dbg-goma-rbe-ats-latest"
+  }
+}
+job {
+  id: "android-archive-dbg-goma-rbe-canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "android-archive-dbg-goma-rbe-canary"
+  }
+}
+job {
+  id: "android-archive-dbg-goma-rbe-latest"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "android-archive-dbg-goma-rbe-latest"
+  }
+}
+job {
+  id: "android-archive-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-archive-rel"
+  }
+}
+job {
+  id: "android-arm64-proguard-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-arm64-proguard-rel"
+  }
+}
+job {
+  id: "android-asan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-asan"
+  }
+}
+job {
+  id: "android-avd-packager"
+  schedule: "0 7 * * 0 *"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-avd-packager"
+  }
+}
+job {
+  id: "android-bfcache-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-bfcache-rel"
+  }
+}
+job {
+  id: "android-binary-size-generator"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-binary-size-generator"
+  }
+}
+job {
+  id: "android-code-coverage"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-code-coverage"
+  }
+}
+job {
+  id: "android-code-coverage-native"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-code-coverage-native"
+  }
+}
+job {
   id: "android-cronet-arm-dbg"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "android-cronet-arm-dbg"
-  >
->
-job: <
+  }
+}
+job {
   id: "android-cronet-arm-rel"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "android-cronet-arm-rel"
-  >
->
-job: <
+  }
+}
+job {
+  id: "android-cronet-arm64-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-arm64-dbg"
+  }
+}
+job {
+  id: "android-cronet-arm64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-arm64-rel"
+  }
+}
+job {
+  id: "android-cronet-asan-arm-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-asan-arm-rel"
+  }
+}
+job {
   id: "android-cronet-kitkat-arm-rel"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "android-cronet-kitkat-arm-rel"
-  >
->
-job: <
+  }
+}
+job {
   id: "android-cronet-lollipop-arm-rel"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "android-cronet-lollipop-arm-rel"
-  >
->
-job: <
+  }
+}
+job {
+  id: "android-cronet-marshmallow-arm64-perf-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-marshmallow-arm64-perf-rel"
+  }
+}
+job {
+  id: "android-cronet-marshmallow-arm64-rel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-marshmallow-arm64-rel"
+  }
+}
+job {
+  id: "android-cronet-x86-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-x86-dbg"
+  }
+}
+job {
+  id: "android-cronet-x86-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-x86-rel"
+  }
+}
+job {
+  id: "android-incremental-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-incremental-dbg"
+  }
+}
+job {
   id: "android-lollipop-arm-rel"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "android-lollipop-arm-rel"
-  >
->
-job: <
+  }
+}
+job {
   id: "android-marshmallow-arm64-rel"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "android-marshmallow-arm64-rel"
-  >
->
-job: <
+  }
+}
+job {
+  id: "android-marshmallow-x86-fyi-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-marshmallow-x86-fyi-rel"
+  }
+}
+job {
+  id: "android-marshmallow-x86-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-marshmallow-x86-rel"
+  }
+}
+job {
+  id: "android-mojo-webview-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-mojo-webview-rel"
+  }
+}
+job {
+  id: "android-nougat-arm64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-nougat-arm64-rel"
+  }
+}
+job {
+  id: "android-official"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-official"
+  }
+}
+job {
   id: "android-pie-arm64-dbg"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "android-pie-arm64-dbg"
-  >
->
-job: <
+  }
+}
+job {
   id: "android-pie-arm64-rel"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "android-pie-arm64-rel"
-  >
->
-job: <
+  }
+}
+job {
+  id: "android-pie-x86-fyi-rel"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-pie-x86-fyi-rel"
+  }
+}
+job {
+  id: "android-pie-x86-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-pie-x86-rel"
+  }
+}
+job {
+  id: "android-sdk-packager"
+  schedule: "0 7 * * 0 *"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-sdk-packager"
+  }
+}
+job {
+  id: "android-weblayer-pie-x86-fyi-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-weblayer-pie-x86-fyi-rel"
+  }
+}
+job {
+  id: "chromeos-amd64-generic-asan-rel"
+  acl_sets: "ci"
+  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: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "chromeos-amd64-generic-cfi-thin-lto-rel"
+  }
+}
+job {
   id: "chromeos-amd64-generic-dbg"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "chromeos-amd64-generic-dbg"
-  >
->
-job: <
+  }
+}
+job {
+  id: "chromeos-amd64-generic-lacros-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "chromeos-amd64-generic-lacros-rel"
+  }
+}
+job {
   id: "chromeos-amd64-generic-rel"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "chromeos-amd64-generic-rel"
-  >
->
-job: <
+  }
+}
+job {
+  id: "chromeos-amd64-generic-rel-goma-canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "chromeos-amd64-generic-rel-goma-canary"
+  }
+}
+job {
+  id: "chromeos-amd64-generic-rel-goma-latest"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "chromeos-amd64-generic-rel-goma-latest"
+  }
+}
+job {
+  id: "chromeos-amd64-generic-rel-goma-rbe-canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "chromeos-amd64-generic-rel-goma-rbe-canary"
+  }
+}
+job {
+  id: "chromeos-amd64-generic-rel-goma-rbe-latest"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "chromeos-amd64-generic-rel-goma-rbe-latest"
+  }
+}
+job {
+  id: "chromeos-arm-generic-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "chromeos-arm-generic-dbg"
+  }
+}
+job {
   id: "chromeos-arm-generic-rel"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "chromeos-arm-generic-rel"
-  >
->
-job: <
+  }
+}
+job {
   id: "chromeos-kevin-rel"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "chromeos-kevin-rel"
-  >
->
-job: <
-  id: "chromeos-kevin-rel-hw-tests"
+  }
+}
+job {
+  id: "ci-ASAN Debug"
   acl_sets: "ci"
-  buildbucket: <
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "chromeos-kevin-rel-hw-tests"
-  >
->
-job: <
+    builder: "ASAN Debug"
+  }
+}
+job {
+  id: "ci-ASAN Release"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 5
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ASAN Release"
+  }
+}
+job {
+  id: "ci-ASAN Release Media"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ASAN Release Media"
+  }
+}
+job {
+  id: "ci-ASan Debug (32-bit x86 with V8-ARM)"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ASan Debug (32-bit x86 with V8-ARM)"
+  }
+}
+job {
+  id: "ci-ASan Release (32-bit x86 with V8-ARM)"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ASan Release (32-bit x86 with V8-ARM)"
+  }
+}
+job {
+  id: "ci-ASan Release Media (32-bit x86 with V8-ARM)"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ASan Release Media (32-bit x86 with V8-ARM)"
+  }
+}
+job {
+  id: "ci-Afl Upload Linux ASan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Afl Upload Linux ASan"
+  }
+}
+job {
+  id: "ci-Android ASAN (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android ASAN (dbg)"
+  }
+}
+job {
+  id: "ci-Android CFI"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android CFI"
+  }
+}
+job {
+  id: "ci-Android FYI 32 Vk Release (Pixel 2)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI 32 Vk Release (Pixel 2)"
+  }
+}
+job {
+  id: "ci-Android FYI 32 dEQP Vk Release (Pixel 2)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI 32 dEQP Vk Release (Pixel 2)"
+  }
+}
+job {
+  id: "ci-Android FYI 64 Perf (Pixel 2)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI 64 Perf (Pixel 2)"
+  }
+}
+job {
+  id: "ci-Android FYI 64 Vk Release (Pixel 2)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI 64 Vk Release (Pixel 2)"
+  }
+}
+job {
+  id: "ci-Android FYI 64 dEQP Vk Release (Pixel 2)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI 64 dEQP Vk Release (Pixel 2)"
+  }
+}
+job {
+  id: "ci-Android FYI Release (NVIDIA Shield TV)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (NVIDIA Shield TV)"
+  }
+}
+job {
+  id: "ci-Android FYI Release (Nexus 5)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 5)"
+  }
+}
+job {
+  id: "ci-Android FYI Release (Nexus 5X)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 5X)"
+  }
+}
+job {
+  id: "ci-Android FYI Release (Nexus 6)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 6)"
+  }
+}
+job {
+  id: "ci-Android FYI Release (Nexus 6P)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 6P)"
+  }
+}
+job {
+  id: "ci-Android FYI Release (Nexus 9)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 9)"
+  }
+}
+job {
+  id: "ci-Android FYI Release (Pixel 2)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Pixel 2)"
+  }
+}
+job {
+  id: "ci-Android FYI SkiaRenderer GL (Nexus 5X)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI SkiaRenderer GL (Nexus 5X)"
+  }
+}
+job {
+  id: "ci-Android FYI SkiaRenderer Vulkan (Pixel 2)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI SkiaRenderer Vulkan (Pixel 2)"
+  }
+}
+job {
+  id: "ci-Android FYI dEQP Release (Nexus 5X)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI dEQP Release (Nexus 5X)"
+  }
+}
+job {
+  id: "ci-Android Release (Nexus 5X)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android Release (Nexus 5X)"
+  }
+}
+job {
+  id: "ci-Android WebLayer P FYI (rel)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebLayer P FYI (rel)"
+  }
+}
+job {
+  id: "ci-Android WebView L (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebView L (dbg)"
+  }
+}
+job {
+  id: "ci-Android WebView M (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebView M (dbg)"
+  }
+}
+job {
+  id: "ci-Android WebView N (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebView N (dbg)"
+  }
+}
+job {
+  id: "ci-Android WebView O (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebView O (dbg)"
+  }
+}
+job {
+  id: "ci-Android WebView P (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebView P (dbg)"
+  }
+}
+job {
+  id: "ci-Android WebView P Blink-CORS FYI (rel)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebView P Blink-CORS FYI (rel)"
+  }
+}
+job {
+  id: "ci-Android WebView P FYI (rel)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebView P FYI (rel)"
+  }
+}
+job {
+  id: "ci-Android arm Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android arm Builder (dbg)"
+  }
+}
+job {
+  id: "ci-Android arm64 Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android arm64 Builder (dbg)"
+  }
+}
+job {
+  id: "ci-Android x64 Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android x64 Builder (dbg)"
+  }
+}
+job {
+  id: "ci-Android x86 Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android x86 Builder (dbg)"
+  }
+}
+job {
+  id: "ci-CFI Linux CF"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "CFI Linux CF"
+  }
+}
+job {
+  id: "ci-CFI Linux ToT"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "CFI Linux ToT"
+  }
+}
+job {
+  id: "ci-Cast Android (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Cast Android (dbg)"
+  }
+}
+job {
+  id: "ci-Cast Audio Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Cast Audio Linux"
+  }
+}
+job {
+  id: "ci-Cast Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Cast Linux"
+  }
+}
+job {
+  id: "ci-ChromeOS FYI Release (amd64-generic)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ChromeOS FYI Release (amd64-generic)"
+  }
+}
+job {
+  id: "ci-ChromeOS FYI Release (kevin)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ChromeOS FYI Release (kevin)"
+  }
+}
+job {
+  id: "ci-ChromiumOS ASAN Release"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 6
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ChromiumOS ASAN Release"
+  }
+}
+job {
+  id: "ci-Closure Compilation Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Closure Compilation Linux"
+  }
+}
+job {
+  id: "ci-CrWinAsan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "CrWinAsan"
+  }
+}
+job {
+  id: "ci-CrWinAsan(dll)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "CrWinAsan(dll)"
+  }
+}
+job {
+  id: "ci-Dawn Linux x64 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Linux x64 Builder"
+  }
+}
+job {
+  id: "ci-Dawn Linux x64 DEPS Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Linux x64 DEPS Builder"
+  }
+}
+job {
+  id: "ci-Dawn Linux x64 DEPS Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Linux x64 DEPS Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-Dawn Linux x64 DEPS Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Linux x64 DEPS Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Dawn Linux x64 Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Linux x64 Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-Dawn Linux x64 Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Linux x64 Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Dawn Mac x64 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 Builder"
+  }
+}
+job {
+  id: "ci-Dawn Mac x64 DEPS Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 DEPS Builder"
+  }
+}
+job {
+  id: "ci-Dawn Mac x64 DEPS Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 DEPS Release (AMD)"
+  }
+}
+job {
+  id: "ci-Dawn Mac x64 DEPS Release (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 DEPS Release (Intel)"
+  }
+}
+job {
+  id: "ci-Dawn Mac x64 Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 Release (AMD)"
+  }
+}
+job {
+  id: "ci-Dawn Mac x64 Release (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Mac x64 Release (Intel)"
+  }
+}
+job {
+  id: "ci-Dawn Win10 x64 ASAN Release"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 ASAN Release"
+  }
+}
+job {
+  id: "ci-Dawn Win10 x64 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 Builder"
+  }
+}
+job {
+  id: "ci-Dawn Win10 x64 DEPS Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 DEPS Builder"
+  }
+}
+job {
+  id: "ci-Dawn Win10 x64 DEPS Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 DEPS Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-Dawn Win10 x64 DEPS Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 DEPS Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Dawn Win10 x64 Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-Dawn Win10 x64 Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x64 Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Dawn Win10 x86 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x86 Builder"
+  }
+}
+job {
+  id: "ci-Dawn Win10 x86 DEPS Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x86 DEPS Builder"
+  }
+}
+job {
+  id: "ci-Dawn Win10 x86 DEPS Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x86 DEPS Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-Dawn Win10 x86 DEPS Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x86 DEPS Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Dawn Win10 x86 Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x86 Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-Dawn Win10 x86 Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Dawn Win10 x86 Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Deterministic Android"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Deterministic Android"
+  }
+}
+job {
+  id: "ci-Deterministic Android (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Deterministic Android (dbg)"
+  }
+}
+job {
+  id: "ci-Deterministic Fuchsia (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Deterministic Fuchsia (dbg)"
+  }
+}
+job {
+  id: "ci-Deterministic Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Deterministic Linux"
+  }
+}
+job {
+  id: "ci-Deterministic Linux (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Deterministic Linux (dbg)"
+  }
+}
+job {
+  id: "ci-Fuchsia ARM64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Fuchsia ARM64"
+  }
+}
+job {
+  id: "ci-Fuchsia x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Fuchsia x64"
+  }
+}
+job {
+  id: "ci-GPU FYI Linux Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Linux Builder"
+  }
+}
+job {
+  id: "ci-GPU FYI Linux Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Linux Builder (dbg)"
+  }
+}
+job {
+  id: "ci-GPU FYI Linux Ozone Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Linux Ozone Builder"
+  }
+}
+job {
+  id: "ci-GPU FYI Linux dEQP Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Linux dEQP Builder"
+  }
+}
+job {
+  id: "ci-GPU FYI Mac Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Mac Builder"
+  }
+}
+job {
+  id: "ci-GPU FYI Mac Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Mac Builder (dbg)"
+  }
+}
+job {
+  id: "ci-GPU FYI Mac dEQP Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Mac dEQP Builder"
+  }
+}
+job {
+  id: "ci-GPU FYI Perf Android 64 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Perf Android 64 Builder"
+  }
+}
+job {
+  id: "ci-GPU FYI Win Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win Builder"
+  }
+}
+job {
+  id: "ci-GPU FYI Win Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win Builder (dbg)"
+  }
+}
+job {
+  id: "ci-GPU FYI Win dEQP Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win dEQP Builder"
+  }
+}
+job {
+  id: "ci-GPU FYI Win x64 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win x64 Builder"
+  }
+}
+job {
+  id: "ci-GPU FYI Win x64 Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win x64 Builder (dbg)"
+  }
+}
+job {
+  id: "ci-GPU FYI Win x64 DX12 Vulkan Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win x64 DX12 Vulkan Builder"
+  }
+}
+job {
+  id: "ci-GPU FYI Win x64 DX12 Vulkan Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win x64 DX12 Vulkan Builder (dbg)"
+  }
+}
+job {
+  id: "ci-GPU FYI Win x64 dEQP Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win x64 dEQP Builder"
+  }
+}
+job {
+  id: "ci-GPU FYI XR Win x64 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI XR Win x64 Builder"
+  }
+}
+job {
+  id: "ci-GPU Linux Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU Linux Builder"
+  }
+}
+job {
+  id: "ci-GPU Linux Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU Linux Builder (dbg)"
+  }
+}
+job {
+  id: "ci-GPU Mac Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU Mac Builder"
+  }
+}
+job {
+  id: "ci-GPU Mac Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU Mac Builder (dbg)"
+  }
+}
+job {
+  id: "ci-GPU Win x64 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU Win x64 Builder"
+  }
+}
+job {
+  id: "ci-GPU Win x64 Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU Win x64 Builder (dbg)"
+  }
+}
+job {
+  id: "ci-Leak Detection Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Leak Detection Linux"
+  }
+}
+job {
+  id: "ci-Libfuzzer Upload Chrome OS ASan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 3
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Chrome OS ASan"
+  }
+}
+job {
+  id: "ci-Libfuzzer Upload Linux ASan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 5
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux ASan"
+  }
+}
+job {
+  id: "ci-Libfuzzer Upload Linux ASan Debug"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 5
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux ASan Debug"
+  }
+}
+job {
+  id: "ci-Libfuzzer Upload Linux MSan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 5
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux MSan"
+  }
+}
+job {
+  id: "ci-Libfuzzer Upload Linux UBSan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 5
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux UBSan"
+  }
+}
+job {
+  id: "ci-Libfuzzer Upload Linux V8-ARM64 ASan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux V8-ARM64 ASan"
+  }
+}
+job {
+  id: "ci-Libfuzzer Upload Linux V8-ARM64 ASan Debug"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux V8-ARM64 ASan Debug"
+  }
+}
+job {
+  id: "ci-Libfuzzer Upload Linux32 ASan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 3
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux32 ASan"
+  }
+}
+job {
+  id: "ci-Libfuzzer Upload Linux32 ASan Debug"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 3
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux32 ASan Debug"
+  }
+}
+job {
+  id: "ci-Libfuzzer Upload Linux32 V8-ARM ASan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux32 V8-ARM ASan"
+  }
+}
+job {
+  id: "ci-Libfuzzer Upload Linux32 V8-ARM ASan Debug"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Linux32 V8-ARM ASan Debug"
+  }
+}
+job {
+  id: "ci-Libfuzzer Upload Mac ASan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Mac ASan"
+  }
+}
+job {
+  id: "ci-Libfuzzer Upload Windows ASan"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 3
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload Windows ASan"
+  }
+}
+job {
+  id: "ci-Linux ASan LSan Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux ASan LSan Builder"
+  }
+}
+job {
+  id: "ci-Linux ASan LSan Tests (1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux ASan LSan Tests (1)"
+  }
+}
+job {
+  id: "ci-Linux ASan Tests (sandboxed)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux ASan Tests (sandboxed)"
+  }
+}
+job {
+  id: "ci-Linux Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Builder"
+  }
+}
+job {
+  id: "ci-Linux Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Builder (dbg)"
+  }
+}
+job {
+  id: "ci-Linux Builder (dbg)(32)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Builder (dbg)(32)"
+  }
+}
+job {
+  id: "ci-Linux CFI"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux CFI"
+  }
+}
+job {
+  id: "ci-Linux Chromium OS ASan LSan Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Chromium OS ASan LSan Builder"
+  }
+}
+job {
+  id: "ci-Linux Chromium OS ASan LSan Tests (1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Chromium OS ASan LSan Tests (1)"
+  }
+}
+job {
+  id: "ci-Linux ChromiumOS Full"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux ChromiumOS Full"
+  }
+}
+job {
+  id: "ci-Linux ChromiumOS MSan Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux ChromiumOS MSan Builder"
+  }
+}
+job {
+  id: "ci-Linux ChromiumOS MSan Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux ChromiumOS MSan Tests"
+  }
+}
+job {
+  id: "ci-Linux Debug (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Debug (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Linux FYI Debug (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Debug (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Linux FYI Experimental Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Experimental Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-Linux FYI Experimental Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Experimental Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Linux FYI GPU TSAN Release"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI GPU TSAN Release"
+  }
+}
+job {
+  id: "ci-Linux FYI Ozone (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Ozone (Intel)"
+  }
+}
+job {
+  id: "ci-Linux FYI Release (AMD R7 240)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Release (AMD R7 240)"
+  }
+}
+job {
+  id: "ci-Linux FYI Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-Linux FYI Release (Intel UHD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Release (Intel UHD 630)"
+  }
+}
+job {
+  id: "ci-Linux FYI Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Linux FYI SkiaRenderer Dawn Release (Intel HD 630)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI SkiaRenderer Dawn Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-Linux FYI SkiaRenderer Vulkan (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI SkiaRenderer Vulkan (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-Linux FYI SkiaRenderer Vulkan (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI SkiaRenderer Vulkan (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Linux FYI dEQP Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI dEQP Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-Linux FYI dEQP Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI dEQP Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Linux MSan Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux MSan Builder"
+  }
+}
+job {
+  id: "ci-Linux MSan Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux MSan Tests"
+  }
+}
+job {
+  id: "ci-Linux Ozone Tester (Headless)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Ozone Tester (Headless)"
+  }
+}
+job {
+  id: "ci-Linux Ozone Tester (Wayland)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Ozone Tester (Wayland)"
+  }
+}
+job {
+  id: "ci-Linux Ozone Tester (X11)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Ozone Tester (X11)"
+  }
+}
+job {
+  id: "ci-Linux Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Linux TSan Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux TSan Builder"
+  }
+}
+job {
+  id: "ci-Linux TSan Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux TSan Tests"
+  }
+}
+job {
+  id: "ci-Linux Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Tests"
+  }
+}
+job {
+  id: "ci-Linux Tests (dbg)(1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Tests (dbg)(1)"
+  }
+}
+job {
+  id: "ci-Linux Viz"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Viz"
+  }
+}
+job {
+  id: "ci-Linux remote_run Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux remote_run Builder"
+  }
+}
+job {
+  id: "ci-Linux remote_run Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux remote_run Tester"
+  }
+}
+job {
+  id: "ci-Lollipop Phone Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Lollipop Phone Tester"
+  }
+}
+job {
+  id: "ci-Lollipop Tablet Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Lollipop Tablet Tester"
+  }
+}
+job {
+  id: "ci-MSAN Release (chained origins)"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "MSAN Release (chained origins)"
+  }
+}
+job {
+  id: "ci-MSAN Release (no origins)"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "MSAN Release (no origins)"
+  }
+}
+job {
+  id: "ci-Mac ASAN Release"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 2
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac ASAN Release"
+  }
+}
+job {
+  id: "ci-Mac ASAN Release Media"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 2
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac ASAN Release Media"
+  }
+}
+job {
+  id: "ci-Mac ASan 64 Builder"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 2
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac ASan 64 Builder"
+  }
+}
+job {
+  id: "ci-Mac ASan 64 Tests (1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac ASan 64 Tests (1)"
+  }
+}
+job {
+  id: "ci-Mac Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Builder"
+  }
+}
+job {
+  id: "ci-Mac Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Builder (dbg)"
+  }
+}
+job {
+  id: "ci-Mac Builder Next"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Builder Next"
+  }
+}
+job {
+  id: "ci-Mac Debug (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Debug (Intel)"
+  }
+}
+job {
+  id: "ci-Mac FYI Debug (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Debug (Intel)"
+  }
+}
+job {
+  id: "ci-Mac FYI Experimental Release (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Experimental Release (Intel)"
+  }
+}
+job {
+  id: "ci-Mac FYI Experimental Retina Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Experimental Retina Release (AMD)"
+  }
+}
+job {
+  id: "ci-Mac FYI Experimental Retina Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Experimental Retina Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Mac FYI GPU ASAN Release"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI GPU ASAN Release"
+  }
+}
+job {
+  id: "ci-Mac FYI Release (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Release (Intel)"
+  }
+}
+job {
+  id: "ci-Mac FYI Retina Debug (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Retina Debug (AMD)"
+  }
+}
+job {
+  id: "ci-Mac FYI Retina Debug (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Retina Debug (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Mac FYI Retina Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Retina Release (AMD)"
+  }
+}
+job {
+  id: "ci-Mac FYI Retina Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Retina Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Mac FYI dEQP Release AMD"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI dEQP Release AMD"
+  }
+}
+job {
+  id: "ci-Mac FYI dEQP Release Intel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI dEQP Release Intel"
+  }
+}
+job {
+  id: "ci-Mac Pro FYI Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Pro FYI Release (AMD)"
+  }
+}
+job {
+  id: "ci-Mac Release (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Release (Intel)"
+  }
+}
+job {
+  id: "ci-Mac Retina Debug (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Retina Debug (AMD)"
+  }
+}
+job {
+  id: "ci-Mac Retina Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Retina Release (AMD)"
+  }
+}
+job {
+  id: "ci-Mac deterministic"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac deterministic"
+  }
+}
+job {
+  id: "ci-Mac deterministic (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac deterministic (dbg)"
+  }
+}
+job {
+  id: "ci-Mac10.10 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.10 Tests"
+  }
+}
+job {
+  id: "ci-Mac10.11 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.11 Tests"
+  }
+}
+job {
+  id: "ci-Mac10.12 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.12 Tests"
+  }
+}
+job {
+  id: "ci-Mac10.13 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.13 Tests"
+  }
+}
+job {
+  id: "ci-Mac10.13 Tests (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.13 Tests (dbg)"
+  }
+}
+job {
+  id: "ci-Mac10.14 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.14 Tests"
+  }
+}
+job {
+  id: "ci-Mac10.15 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.15 Tests"
+  }
+}
+job {
+  id: "ci-Marshmallow 64 bit Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Marshmallow 64 bit Tester"
+  }
+}
+job {
+  id: "ci-Marshmallow Tablet Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Marshmallow Tablet Tester"
+  }
+}
+job {
+  id: "ci-Mojo Android"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mojo Android"
+  }
+}
+job {
+  id: "ci-Mojo ChromiumOS"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mojo ChromiumOS"
+  }
+}
+job {
+  id: "ci-Mojo Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mojo Linux"
+  }
+}
+job {
+  id: "ci-Mojo Windows"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mojo Windows"
+  }
+}
+job {
+  id: "ci-Network Service Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Network Service Linux"
+  }
+}
+job {
+  id: "ci-Nougat Phone Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Nougat Phone Tester"
+  }
+}
+job {
+  id: "ci-Oreo Phone Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Oreo Phone Tester"
+  }
+}
+job {
+  id: "ci-Site Isolation Android"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Site Isolation Android"
+  }
+}
+job {
+  id: "ci-TSAN Debug"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "TSAN Debug"
+  }
+}
+job {
+  id: "ci-TSAN Release"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 3
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "TSAN Release"
+  }
+}
+job {
+  id: "ci-ToTAndroid"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTAndroid"
+  }
+}
+job {
+  id: "ci-ToTAndroid (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTAndroid (dbg)"
+  }
+}
+job {
+  id: "ci-ToTAndroid x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTAndroid x64"
+  }
+}
+job {
+  id: "ci-ToTAndroid64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTAndroid64"
+  }
+}
+job {
+  id: "ci-ToTAndroidASan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTAndroidASan"
+  }
+}
+job {
+  id: "ci-ToTAndroidCFI"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTAndroidCFI"
+  }
+}
+job {
+  id: "ci-ToTAndroidOfficial"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTAndroidOfficial"
+  }
+}
+job {
+  id: "ci-ToTLinux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinux"
+  }
+}
+job {
+  id: "ci-ToTLinux (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinux (dbg)"
+  }
+}
+job {
+  id: "ci-ToTLinuxASan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinuxASan"
+  }
+}
+job {
+  id: "ci-ToTLinuxASanLibfuzzer"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinuxASanLibfuzzer"
+  }
+}
+job {
+  id: "ci-ToTLinuxCoverage"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinuxCoverage"
+  }
+}
+job {
+  id: "ci-ToTLinuxMSan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinuxMSan"
+  }
+}
+job {
+  id: "ci-ToTLinuxTSan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinuxTSan"
+  }
+}
+job {
+  id: "ci-ToTLinuxThinLTO"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinuxThinLTO"
+  }
+}
+job {
+  id: "ci-ToTLinuxUBSanVptr"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTLinuxUBSanVptr"
+  }
+}
+job {
+  id: "ci-ToTMac"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTMac"
+  }
+}
+job {
+  id: "ci-ToTMac (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTMac (dbg)"
+  }
+}
+job {
+  id: "ci-ToTMacASan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTMacASan"
+  }
+}
+job {
+  id: "ci-ToTMacCoverage"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTMacCoverage"
+  }
+}
+job {
+  id: "ci-ToTWin(dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTWin(dbg)"
+  }
+}
+job {
+  id: "ci-ToTWin(dll)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTWin(dll)"
+  }
+}
+job {
+  id: "ci-ToTWin64(dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTWin64(dbg)"
+  }
+}
+job {
+  id: "ci-ToTWin64(dll)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTWin64(dll)"
+  }
+}
+job {
+  id: "ci-ToTWinASanLibfuzzer"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTWinASanLibfuzzer"
+  }
+}
+job {
+  id: "ci-ToTWinCFI"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTWinCFI"
+  }
+}
+job {
+  id: "ci-ToTWinCFI64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTWinCFI64"
+  }
+}
+job {
+  id: "ci-ToTiOS"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTiOS"
+  }
+}
+job {
+  id: "ci-ToTiOSDevice"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ToTiOSDevice"
+  }
+}
+job {
+  id: "ci-UBSan Release"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "UBSan Release"
+  }
+}
+job {
+  id: "ci-UBSan vptr Release"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 4
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "UBSan vptr Release"
+  }
+}
+job {
+  id: "ci-UBSanVptr Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "UBSanVptr Linux"
+  }
+}
+job {
+  id: "ci-VR Linux"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "VR Linux"
+  }
+}
+job {
+  id: "ci-WebKit Linux ASAN"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "WebKit Linux ASAN"
+  }
+}
+job {
+  id: "ci-WebKit Linux Leak"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "WebKit Linux Leak"
+  }
+}
+job {
+  id: "ci-WebKit Linux MSAN"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "WebKit Linux MSAN"
+  }
+}
+job {
+  id: "ci-WebKit Mac10.13 (retina)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "WebKit Mac10.13 (retina)"
+  }
+}
+job {
+  id: "ci-WebKit Win10"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "WebKit Win10"
+  }
+}
+job {
+  id: "ci-Win 10 Fast Ring"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win 10 Fast Ring"
+  }
+}
+job {
+  id: "ci-Win 7 Tests x64 (1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win 7 Tests x64 (1)"
+  }
+}
+job {
+  id: "ci-Win ASan Release"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 7
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win ASan Release"
+  }
+}
+job {
+  id: "ci-Win ASan Release Media"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 6
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win ASan Release Media"
+  }
+}
+job {
+  id: "ci-Win Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win Builder"
+  }
+}
+job {
+  id: "ci-Win Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win Builder (dbg)"
+  }
+}
+job {
+  id: "ci-Win x64 Builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win x64 Builder"
+  }
+}
+job {
+  id: "ci-Win x64 Builder (dbg)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win x64 Builder (dbg)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 DX12 Vulkan Debug (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 DX12 Vulkan Debug (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 DX12 Vulkan Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 DX12 Vulkan Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 Debug (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Debug (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 Exp Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Exp Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 Exp Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Exp Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 Release (AMD RX 550)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Release (AMD RX 550)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 Release (Intel UHD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Release (Intel UHD 630)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 Release XR Perf (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Release XR Perf (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 SkiaRenderer Dawn Release (NVIDIA)"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 SkiaRenderer Dawn Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 SkiaRenderer GL (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 SkiaRenderer GL (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 dEQP Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 dEQP Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x64 dEQP Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 dEQP Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win10 FYI x86 Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x86 Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win10 Tests x64"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 Tests x64"
+  }
+}
+job {
+  id: "ci-Win10 Tests x64 (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 Tests x64 (dbg)"
+  }
+}
+job {
+  id: "ci-Win10 Tests x64 1803"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 Tests x64 1803"
+  }
+}
+job {
+  id: "ci-Win10 x64 Debug (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 x64 Debug (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win10 x64 Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 x64 Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win7 (32) Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 (32) Tests"
+  }
+}
+job {
+  id: "ci-Win7 FYI Debug (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI Debug (AMD)"
+  }
+}
+job {
+  id: "ci-Win7 FYI Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI Release (AMD)"
+  }
+}
+job {
+  id: "ci-Win7 FYI Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win7 FYI dEQP Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI dEQP Release (AMD)"
+  }
+}
+job {
+  id: "ci-Win7 FYI x64 Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI x64 Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win7 FYI x64 dEQP Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI x64 dEQP Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-Win7 Tests (1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 Tests (1)"
+  }
+}
+job {
+  id: "ci-Win7 Tests (dbg)(1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 Tests (dbg)(1)"
+  }
+}
+job {
+  id: "ci-Windows deterministic"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Windows deterministic"
+  }
+}
+job {
+  id: "ci-android-10-arm64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-10-arm64-rel"
+  }
+}
+job {
+  id: "ci-android-archive-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-archive-dbg"
+  }
+}
+job {
+  id: "ci-android-archive-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-archive-rel"
+  }
+}
+job {
+  id: "ci-android-arm64-proguard-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-arm64-proguard-rel"
+  }
+}
+job {
+  id: "ci-android-asan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-asan"
+  }
+}
+job {
+  id: "ci-android-bfcache-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-bfcache-rel"
+  }
+}
+job {
+  id: "ci-android-binary-size-generator"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-binary-size-generator"
+  }
+}
+job {
+  id: "ci-android-code-coverage"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-code-coverage"
+  }
+}
+job {
+  id: "ci-android-code-coverage-native"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-code-coverage-native"
+  }
+}
+job {
+  id: "ci-android-cronet-arm-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-arm-dbg"
+  }
+}
+job {
+  id: "ci-android-cronet-arm-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-arm-rel"
+  }
+}
+job {
+  id: "ci-android-cronet-arm64-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-arm64-dbg"
+  }
+}
+job {
+  id: "ci-android-cronet-arm64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-arm64-rel"
+  }
+}
+job {
+  id: "ci-android-cronet-asan-arm-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-asan-arm-rel"
+  }
+}
+job {
+  id: "ci-android-cronet-kitkat-arm-rel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-kitkat-arm-rel"
+  }
+}
+job {
+  id: "ci-android-cronet-lollipop-arm-rel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-lollipop-arm-rel"
+  }
+}
+job {
+  id: "ci-android-cronet-marshmallow-arm64-perf-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-marshmallow-arm64-perf-rel"
+  }
+}
+job {
+  id: "ci-android-cronet-marshmallow-arm64-rel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-marshmallow-arm64-rel"
+  }
+}
+job {
+  id: "ci-android-cronet-x86-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-x86-dbg"
+  }
+}
+job {
+  id: "ci-android-cronet-x86-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-cronet-x86-rel"
+  }
+}
+job {
+  id: "ci-android-incremental-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-incremental-dbg"
+  }
+}
+job {
+  id: "ci-android-lollipop-arm-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-lollipop-arm-rel"
+  }
+}
+job {
+  id: "ci-android-marshmallow-arm64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-marshmallow-arm64-rel"
+  }
+}
+job {
+  id: "ci-android-marshmallow-x86-fyi-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-marshmallow-x86-fyi-rel"
+  }
+}
+job {
+  id: "ci-android-marshmallow-x86-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-marshmallow-x86-rel"
+  }
+}
+job {
+  id: "ci-android-mojo-webview-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-mojo-webview-rel"
+  }
+}
+job {
+  id: "ci-android-nougat-arm64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-nougat-arm64-rel"
+  }
+}
+job {
+  id: "ci-android-official"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-official"
+  }
+}
+job {
+  id: "ci-android-pie-arm64-dbg"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-pie-arm64-dbg"
+  }
+}
+job {
+  id: "ci-android-pie-arm64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-pie-arm64-rel"
+  }
+}
+job {
+  id: "ci-android-pie-x86-fyi-rel"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-pie-x86-fyi-rel"
+  }
+}
+job {
+  id: "ci-android-pie-x86-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-pie-x86-rel"
+  }
+}
+job {
+  id: "ci-android-weblayer-pie-x86-fyi-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-weblayer-pie-x86-fyi-rel"
+  }
+}
+job {
+  id: "ci-chromeos-amd64-generic-asan-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "chromeos-amd64-generic-asan-rel"
+  }
+}
+job {
+  id: "ci-chromeos-amd64-generic-cfi-thin-lto-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "chromeos-amd64-generic-cfi-thin-lto-rel"
+  }
+}
+job {
+  id: "ci-chromeos-amd64-generic-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "chromeos-amd64-generic-dbg"
+  }
+}
+job {
+  id: "ci-chromeos-amd64-generic-lacros-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "chromeos-amd64-generic-lacros-rel"
+  }
+}
+job {
+  id: "ci-chromeos-amd64-generic-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "chromeos-amd64-generic-rel"
+  }
+}
+job {
+  id: "ci-chromeos-arm-generic-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "chromeos-arm-generic-dbg"
+  }
+}
+job {
+  id: "ci-chromeos-arm-generic-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "chromeos-arm-generic-rel"
+  }
+}
+job {
+  id: "ci-chromeos-kevin-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "chromeos-kevin-rel"
+  }
+}
+job {
+  id: "ci-fuchsia-arm64-cast"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-arm64-cast"
+  }
+}
+job {
+  id: "ci-fuchsia-fyi-arm64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-fyi-arm64-rel"
+  }
+}
+job {
+  id: "ci-fuchsia-fyi-x64-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-fyi-x64-dbg"
+  }
+}
+job {
+  id: "ci-fuchsia-fyi-x64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-fyi-x64-rel"
+  }
+}
+job {
+  id: "ci-fuchsia-official"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-official"
+  }
+}
+job {
+  id: "ci-fuchsia-x64-cast"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-x64-cast"
+  }
+}
+job {
+  id: "ci-fuchsia-x64-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-x64-dbg"
+  }
+}
+job {
+  id: "ci-ios-asan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-asan"
+  }
+}
+job {
+  id: "ci-ios-device"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-device"
+  }
+}
+job {
+  id: "ci-ios-simulator"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-simulator"
+  }
+}
+job {
+  id: "ci-ios-simulator-code-coverage"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-simulator-code-coverage"
+  }
+}
+job {
+  id: "ci-ios-simulator-cr-recipe"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-simulator-cr-recipe"
+  }
+}
+job {
+  id: "ci-ios-simulator-cronet"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-simulator-cronet"
+  }
+}
+job {
+  id: "ci-ios-simulator-full-configs"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-simulator-full-configs"
+  }
+}
+job {
+  id: "ci-ios-simulator-multi-window"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-simulator-multi-window"
+  }
+}
+job {
+  id: "ci-ios-simulator-noncq"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-simulator-noncq"
+  }
+}
+job {
+  id: "ci-ios13-sdk-device"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios13-sdk-device"
+  }
+}
+job {
+  id: "ci-ios14-beta-simulator"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios14-beta-simulator"
+  }
+}
+job {
+  id: "ci-ios14-sdk-simulator"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios14-sdk-simulator"
+  }
+}
+job {
+  id: "ci-linux-annotator-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-annotator-rel"
+  }
+}
+job {
+  id: "ci-linux-archive-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-archive-dbg"
+  }
+}
+job {
+  id: "ci-linux-archive-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-archive-rel"
+  }
+}
+job {
+  id: "ci-linux-bfcache-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-bfcache-rel"
+  }
+}
+job {
+  id: "ci-linux-blink-animation-use-time-delta"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-blink-animation-use-time-delta"
+  }
+}
+job {
+  id: "ci-linux-blink-cors-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-blink-cors-rel"
+  }
+}
+job {
+  id: "ci-linux-blink-heap-concurrent-marking-tsan-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-blink-heap-concurrent-marking-tsan-rel"
+  }
+}
+job {
+  id: "ci-linux-blink-heap-verification"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-blink-heap-verification"
+  }
+}
+job {
+  id: "ci-linux-chromeos-code-coverage"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-chromeos-code-coverage"
+  }
+}
+job {
+  id: "ci-linux-chromeos-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-chromeos-dbg"
+  }
+}
+job {
+  id: "ci-linux-chromeos-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-chromeos-rel"
+  }
+}
+job {
+  id: "ci-linux-chromium-tests-staging-builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-chromium-tests-staging-builder"
+  }
+}
+job {
+  id: "ci-linux-chromium-tests-staging-tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-chromium-tests-staging-tests"
+  }
+}
+job {
+  id: "ci-linux-fieldtrial-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-fieldtrial-rel"
+  }
+}
+job {
+  id: "ci-linux-gcc-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-gcc-rel"
+  }
+}
+job {
+  id: "ci-linux-official"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-official"
+  }
+}
+job {
+  id: "ci-linux-ozone-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-ozone-rel"
+  }
+}
+job {
+  id: "ci-linux-perfetto-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-perfetto-rel"
+  }
+}
+job {
+  id: "ci-linux-swangle-chromium-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-chromium-x64"
+  }
+}
+job {
+  id: "ci-linux-swangle-tot-angle-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-angle-x64"
+  }
+}
+job {
+  id: "ci-linux-swangle-tot-angle-x86"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-angle-x86"
+  }
+}
+job {
+  id: "ci-linux-swangle-tot-swiftshader-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-swiftshader-x64"
+  }
+}
+job {
+  id: "ci-linux-swangle-tot-swiftshader-x86"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-swiftshader-x86"
+  }
+}
+job {
+  id: "ci-linux-swangle-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-x64"
+  }
+}
+job {
+  id: "ci-linux-swangle-x86"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-x86"
+  }
+}
+job {
+  id: "ci-linux-trusty-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-trusty-rel"
+  }
+}
+job {
+  id: "ci-linux-upload-perfetto"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-upload-perfetto"
+  }
+}
+job {
+  id: "ci-linux-win_cross-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-win_cross-rel"
+  }
+}
+job {
+  id: "ci-linux-wpt-fyi-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-wpt-fyi-rel"
+  }
+}
+job {
+  id: "ci-m83-Android Release (Nexus 5X)"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Android Release (Nexus 5X)"
+  }
+}
+job {
+  id: "ci-m83-Android WebView M (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Android WebView M (dbg)"
+  }
+}
+job {
+  id: "ci-m83-Android WebView N (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Android WebView N (dbg)"
+  }
+}
+job {
+  id: "ci-m83-Android WebView O (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Android WebView O (dbg)"
+  }
+}
+job {
+  id: "ci-m83-Android WebView P (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Android WebView P (dbg)"
+  }
+}
+job {
+  id: "ci-m83-Android arm Builder (dbg)"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Android arm Builder (dbg)"
+  }
+}
+job {
+  id: "ci-m83-Android arm64 Builder (dbg)"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Android arm64 Builder (dbg)"
+  }
+}
+job {
+  id: "ci-m83-Android x64 Builder (dbg)"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Android x64 Builder (dbg)"
+  }
+}
+job {
+  id: "ci-m83-Android x86 Builder (dbg)"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Android x86 Builder (dbg)"
+  }
+}
+job {
+  id: "ci-m83-Cast Android (dbg)"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Cast Android (dbg)"
+  }
+}
+job {
+  id: "ci-m83-Cast Linux"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Cast Linux"
+  }
+}
+job {
+  id: "ci-m83-Dawn Linux x64 DEPS Builder"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Dawn Linux x64 DEPS Builder"
+  }
+}
+job {
+  id: "ci-m83-Dawn Linux x64 DEPS Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Dawn Linux x64 DEPS Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-m83-Dawn Linux x64 DEPS Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Dawn Linux x64 DEPS Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-m83-Dawn Mac x64 DEPS Builder"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Dawn Mac x64 DEPS Builder"
+  }
+}
+job {
+  id: "ci-m83-Dawn Mac x64 DEPS Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Dawn Mac x64 DEPS Release (AMD)"
+  }
+}
+job {
+  id: "ci-m83-Dawn Mac x64 DEPS Release (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Dawn Mac x64 DEPS Release (Intel)"
+  }
+}
+job {
+  id: "ci-m83-Dawn Win10 x64 DEPS Builder"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Dawn Win10 x64 DEPS Builder"
+  }
+}
+job {
+  id: "ci-m83-Dawn Win10 x64 DEPS Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Dawn Win10 x64 DEPS Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-m83-Dawn Win10 x64 DEPS Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Dawn Win10 x64 DEPS Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-m83-Dawn Win10 x86 DEPS Builder"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Dawn Win10 x86 DEPS Builder"
+  }
+}
+job {
+  id: "ci-m83-Dawn Win10 x86 DEPS Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Dawn Win10 x86 DEPS Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-m83-Dawn Win10 x86 DEPS Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Dawn Win10 x86 DEPS Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-m83-Fuchsia ARM64"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Fuchsia ARM64"
+  }
+}
+job {
+  id: "ci-m83-Fuchsia x64"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Fuchsia x64"
+  }
+}
+job {
+  id: "ci-m83-GPU Linux Builder"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "GPU Linux Builder"
+  }
+}
+job {
+  id: "ci-m83-GPU Mac Builder"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "GPU Mac Builder"
+  }
+}
+job {
+  id: "ci-m83-GPU Win x64 Builder"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "GPU Win x64 Builder"
+  }
+}
+job {
+  id: "ci-m83-Linux ASan LSan Builder"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Linux ASan LSan Builder"
+  }
+}
+job {
+  id: "ci-m83-Linux ASan LSan Tests (1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Linux ASan LSan Tests (1)"
+  }
+}
+job {
+  id: "ci-m83-Linux ASan Tests (sandboxed)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Linux ASan Tests (sandboxed)"
+  }
+}
+job {
+  id: "ci-m83-Linux Builder"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Linux Builder"
+  }
+}
+job {
+  id: "ci-m83-Linux Builder (dbg)"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Linux Builder (dbg)"
+  }
+}
+job {
+  id: "ci-m83-Linux Ozone Tester (Headless)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Linux Ozone Tester (Headless)"
+  }
+}
+job {
+  id: "ci-m83-Linux Ozone Tester (Wayland)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Linux Ozone Tester (Wayland)"
+  }
+}
+job {
+  id: "ci-m83-Linux Ozone Tester (X11)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Linux Ozone Tester (X11)"
+  }
+}
+job {
+  id: "ci-m83-Linux Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Linux Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-m83-Linux TSan Builder"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Linux TSan Builder"
+  }
+}
+job {
+  id: "ci-m83-Linux TSan Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Linux TSan Tests"
+  }
+}
+job {
+  id: "ci-m83-Linux Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Linux Tests"
+  }
+}
+job {
+  id: "ci-m83-Linux Tests (dbg)(1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Linux Tests (dbg)(1)"
+  }
+}
+job {
+  id: "ci-m83-Mac Builder"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Mac Builder"
+  }
+}
+job {
+  id: "ci-m83-Mac Builder (dbg)"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Mac Builder (dbg)"
+  }
+}
+job {
+  id: "ci-m83-Mac Release (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Mac Release (Intel)"
+  }
+}
+job {
+  id: "ci-m83-Mac Retina Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Mac Retina Release (AMD)"
+  }
+}
+job {
+  id: "ci-m83-Mac10.10 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Mac10.10 Tests"
+  }
+}
+job {
+  id: "ci-m83-Mac10.11 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Mac10.11 Tests"
+  }
+}
+job {
+  id: "ci-m83-Mac10.12 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Mac10.12 Tests"
+  }
+}
+job {
+  id: "ci-m83-Mac10.13 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Mac10.13 Tests"
+  }
+}
+job {
+  id: "ci-m83-Mac10.13 Tests (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Mac10.13 Tests (dbg)"
+  }
+}
+job {
+  id: "ci-m83-Mac10.14 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Mac10.14 Tests"
+  }
+}
+job {
+  id: "ci-m83-Marshmallow 64 bit Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Marshmallow 64 bit Tester"
+  }
+}
+job {
+  id: "ci-m83-Nougat Phone Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Nougat Phone Tester"
+  }
+}
+job {
+  id: "ci-m83-Oreo Phone Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Oreo Phone Tester"
+  }
+}
+job {
+  id: "ci-m83-VR Linux"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "VR Linux"
+  }
+}
+job {
+  id: "ci-m83-WebKit Mac10.13 (retina)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "WebKit Mac10.13 (retina)"
+  }
+}
+job {
+  id: "ci-m83-Win 7 Tests x64 (1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Win 7 Tests x64 (1)"
+  }
+}
+job {
+  id: "ci-m83-Win Builder (dbg)"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Win Builder (dbg)"
+  }
+}
+job {
+  id: "ci-m83-Win x64 Builder"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Win x64 Builder"
+  }
+}
+job {
+  id: "ci-m83-Win10 Tests x64"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Win10 Tests x64"
+  }
+}
+job {
+  id: "ci-m83-Win10 Tests x64 1803"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Win10 Tests x64 1803"
+  }
+}
+job {
+  id: "ci-m83-Win10 x64 Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Win10 x64 Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-m83-Win7 Tests (dbg)(1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "Win7 Tests (dbg)(1)"
+  }
+}
+job {
+  id: "ci-m83-android-cronet-arm-dbg"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "android-cronet-arm-dbg"
+  }
+}
+job {
+  id: "ci-m83-android-cronet-arm-rel"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "android-cronet-arm-rel"
+  }
+}
+job {
+  id: "ci-m83-android-cronet-kitkat-arm-rel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "android-cronet-kitkat-arm-rel"
+  }
+}
+job {
+  id: "ci-m83-android-cronet-lollipop-arm-rel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "android-cronet-lollipop-arm-rel"
+  }
+}
+job {
+  id: "ci-m83-android-lollipop-arm-rel"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "android-lollipop-arm-rel"
+  }
+}
+job {
+  id: "ci-m83-android-marshmallow-arm64-rel"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "android-marshmallow-arm64-rel"
+  }
+}
+job {
+  id: "ci-m83-android-pie-arm64-dbg"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "android-pie-arm64-dbg"
+  }
+}
+job {
+  id: "ci-m83-android-pie-arm64-rel"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "android-pie-arm64-rel"
+  }
+}
+job {
+  id: "ci-m83-chromeos-amd64-generic-dbg"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "chromeos-amd64-generic-dbg"
+  }
+}
+job {
+  id: "ci-m83-chromeos-amd64-generic-rel"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "chromeos-amd64-generic-rel"
+  }
+}
+job {
+  id: "ci-m83-chromeos-arm-generic-rel"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "chromeos-arm-generic-rel"
+  }
+}
+job {
+  id: "ci-m83-fuchsia-arm64-cast"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "fuchsia-arm64-cast"
+  }
+}
+job {
+  id: "ci-m83-fuchsia-x64-cast"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "fuchsia-x64-cast"
+  }
+}
+job {
+  id: "ci-m83-ios-simulator"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "ios-simulator"
+  }
+}
+job {
+  id: "ci-m83-ios-simulator-cronet"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "ios-simulator-cronet"
+  }
+}
+job {
+  id: "ci-m83-ios-simulator-full-configs"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "ios-simulator-full-configs"
+  }
+}
+job {
+  id: "ci-m83-linux-chromeos-dbg"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "linux-chromeos-dbg"
+  }
+}
+job {
+  id: "ci-m83-linux-chromeos-rel"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "linux-chromeos-rel"
+  }
+}
+job {
+  id: "ci-m83-linux-ozone-rel"
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "linux-ozone-rel"
+  }
+}
+job {
+  id: "ci-m83-mac-osxbeta-rel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m83"
+    builder: "mac-osxbeta-rel"
+  }
+}
+job {
+  id: "ci-m84-Android Release (Nexus 5X)"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Android Release (Nexus 5X)"
+  }
+}
+job {
+  id: "ci-m84-Android WebView M (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Android WebView M (dbg)"
+  }
+}
+job {
+  id: "ci-m84-Android WebView N (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Android WebView N (dbg)"
+  }
+}
+job {
+  id: "ci-m84-Android WebView O (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Android WebView O (dbg)"
+  }
+}
+job {
+  id: "ci-m84-Android WebView P (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Android WebView P (dbg)"
+  }
+}
+job {
+  id: "ci-m84-Android arm Builder (dbg)"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Android arm Builder (dbg)"
+  }
+}
+job {
+  id: "ci-m84-Android arm64 Builder (dbg)"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Android arm64 Builder (dbg)"
+  }
+}
+job {
+  id: "ci-m84-Android x64 Builder (dbg)"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Android x64 Builder (dbg)"
+  }
+}
+job {
+  id: "ci-m84-Android x86 Builder (dbg)"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Android x86 Builder (dbg)"
+  }
+}
+job {
+  id: "ci-m84-Cast Android (dbg)"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Cast Android (dbg)"
+  }
+}
+job {
+  id: "ci-m84-Cast Linux"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Cast Linux"
+  }
+}
+job {
+  id: "ci-m84-Dawn Linux x64 DEPS Builder"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Dawn Linux x64 DEPS Builder"
+  }
+}
+job {
+  id: "ci-m84-Dawn Linux x64 DEPS Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Dawn Linux x64 DEPS Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-m84-Dawn Linux x64 DEPS Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Dawn Linux x64 DEPS Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-m84-Dawn Mac x64 DEPS Builder"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Dawn Mac x64 DEPS Builder"
+  }
+}
+job {
+  id: "ci-m84-Dawn Mac x64 DEPS Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Dawn Mac x64 DEPS Release (AMD)"
+  }
+}
+job {
+  id: "ci-m84-Dawn Mac x64 DEPS Release (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Dawn Mac x64 DEPS Release (Intel)"
+  }
+}
+job {
+  id: "ci-m84-Dawn Win10 x64 DEPS Builder"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Dawn Win10 x64 DEPS Builder"
+  }
+}
+job {
+  id: "ci-m84-Dawn Win10 x64 DEPS Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Dawn Win10 x64 DEPS Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-m84-Dawn Win10 x64 DEPS Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Dawn Win10 x64 DEPS Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-m84-Dawn Win10 x86 DEPS Builder"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Dawn Win10 x86 DEPS Builder"
+  }
+}
+job {
+  id: "ci-m84-Dawn Win10 x86 DEPS Release (Intel HD 630)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Dawn Win10 x86 DEPS Release (Intel HD 630)"
+  }
+}
+job {
+  id: "ci-m84-Dawn Win10 x86 DEPS Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Dawn Win10 x86 DEPS Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-m84-Fuchsia ARM64"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Fuchsia ARM64"
+  }
+}
+job {
+  id: "ci-m84-Fuchsia x64"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Fuchsia x64"
+  }
+}
+job {
+  id: "ci-m84-GPU Linux Builder"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "GPU Linux Builder"
+  }
+}
+job {
+  id: "ci-m84-GPU Mac Builder"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "GPU Mac Builder"
+  }
+}
+job {
+  id: "ci-m84-GPU Win x64 Builder"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "GPU Win x64 Builder"
+  }
+}
+job {
+  id: "ci-m84-Linux ASan LSan Builder"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Linux ASan LSan Builder"
+  }
+}
+job {
+  id: "ci-m84-Linux ASan LSan Tests (1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Linux ASan LSan Tests (1)"
+  }
+}
+job {
+  id: "ci-m84-Linux ASan Tests (sandboxed)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Linux ASan Tests (sandboxed)"
+  }
+}
+job {
+  id: "ci-m84-Linux Builder"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Linux Builder"
+  }
+}
+job {
+  id: "ci-m84-Linux Builder (dbg)"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Linux Builder (dbg)"
+  }
+}
+job {
+  id: "ci-m84-Linux Ozone Tester (Headless)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Linux Ozone Tester (Headless)"
+  }
+}
+job {
+  id: "ci-m84-Linux Ozone Tester (Wayland)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Linux Ozone Tester (Wayland)"
+  }
+}
+job {
+  id: "ci-m84-Linux Ozone Tester (X11)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Linux Ozone Tester (X11)"
+  }
+}
+job {
+  id: "ci-m84-Linux Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Linux Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-m84-Linux TSan Builder"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Linux TSan Builder"
+  }
+}
+job {
+  id: "ci-m84-Linux TSan Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Linux TSan Tests"
+  }
+}
+job {
+  id: "ci-m84-Linux Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Linux Tests"
+  }
+}
+job {
+  id: "ci-m84-Linux Tests (dbg)(1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Linux Tests (dbg)(1)"
+  }
+}
+job {
+  id: "ci-m84-Mac Builder"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Mac Builder"
+  }
+}
+job {
+  id: "ci-m84-Mac Builder (dbg)"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Mac Builder (dbg)"
+  }
+}
+job {
+  id: "ci-m84-Mac Release (Intel)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Mac Release (Intel)"
+  }
+}
+job {
+  id: "ci-m84-Mac Retina Release (AMD)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Mac Retina Release (AMD)"
+  }
+}
+job {
+  id: "ci-m84-Mac10.10 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Mac10.10 Tests"
+  }
+}
+job {
+  id: "ci-m84-Mac10.11 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Mac10.11 Tests"
+  }
+}
+job {
+  id: "ci-m84-Mac10.12 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Mac10.12 Tests"
+  }
+}
+job {
+  id: "ci-m84-Mac10.13 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Mac10.13 Tests"
+  }
+}
+job {
+  id: "ci-m84-Mac10.13 Tests (dbg)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Mac10.13 Tests (dbg)"
+  }
+}
+job {
+  id: "ci-m84-Mac10.14 Tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Mac10.14 Tests"
+  }
+}
+job {
+  id: "ci-m84-Marshmallow 64 bit Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Marshmallow 64 bit Tester"
+  }
+}
+job {
+  id: "ci-m84-Nougat Phone Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Nougat Phone Tester"
+  }
+}
+job {
+  id: "ci-m84-Oreo Phone Tester"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Oreo Phone Tester"
+  }
+}
+job {
+  id: "ci-m84-VR Linux"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "VR Linux"
+  }
+}
+job {
+  id: "ci-m84-WebKit Mac10.13 (retina)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "WebKit Mac10.13 (retina)"
+  }
+}
+job {
+  id: "ci-m84-Win 7 Tests x64 (1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Win 7 Tests x64 (1)"
+  }
+}
+job {
+  id: "ci-m84-Win Builder (dbg)"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Win Builder (dbg)"
+  }
+}
+job {
+  id: "ci-m84-Win x64 Builder"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Win x64 Builder"
+  }
+}
+job {
+  id: "ci-m84-Win10 Tests x64"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Win10 Tests x64"
+  }
+}
+job {
+  id: "ci-m84-Win10 Tests x64 1803"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Win10 Tests x64 1803"
+  }
+}
+job {
+  id: "ci-m84-Win10 x64 Release (NVIDIA)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Win10 x64 Release (NVIDIA)"
+  }
+}
+job {
+  id: "ci-m84-Win7 Tests (dbg)(1)"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "Win7 Tests (dbg)(1)"
+  }
+}
+job {
+  id: "ci-m84-android-cronet-arm-dbg"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "android-cronet-arm-dbg"
+  }
+}
+job {
+  id: "ci-m84-android-cronet-arm-rel"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "android-cronet-arm-rel"
+  }
+}
+job {
+  id: "ci-m84-android-cronet-kitkat-arm-rel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "android-cronet-kitkat-arm-rel"
+  }
+}
+job {
+  id: "ci-m84-android-cronet-lollipop-arm-rel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "android-cronet-lollipop-arm-rel"
+  }
+}
+job {
+  id: "ci-m84-android-lollipop-arm-rel"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "android-lollipop-arm-rel"
+  }
+}
+job {
+  id: "ci-m84-android-marshmallow-arm64-rel"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "android-marshmallow-arm64-rel"
+  }
+}
+job {
+  id: "ci-m84-android-pie-arm64-dbg"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "android-pie-arm64-dbg"
+  }
+}
+job {
+  id: "ci-m84-android-pie-arm64-rel"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "android-pie-arm64-rel"
+  }
+}
+job {
+  id: "ci-m84-chromeos-amd64-generic-dbg"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "chromeos-amd64-generic-dbg"
+  }
+}
+job {
+  id: "ci-m84-chromeos-amd64-generic-rel"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "chromeos-amd64-generic-rel"
+  }
+}
+job {
+  id: "ci-m84-chromeos-arm-generic-rel"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "chromeos-arm-generic-rel"
+  }
+}
+job {
+  id: "ci-m84-fuchsia-arm64-cast"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "fuchsia-arm64-cast"
+  }
+}
+job {
+  id: "ci-m84-fuchsia-x64-cast"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "fuchsia-x64-cast"
+  }
+}
+job {
+  id: "ci-m84-ios-simulator"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "ios-simulator"
+  }
+}
+job {
+  id: "ci-m84-ios-simulator-cronet"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "ios-simulator-cronet"
+  }
+}
+job {
+  id: "ci-m84-ios-simulator-full-configs"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "ios-simulator-full-configs"
+  }
+}
+job {
+  id: "ci-m84-linux-chromeos-dbg"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "linux-chromeos-dbg"
+  }
+}
+job {
+  id: "ci-m84-linux-chromeos-rel"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "linux-chromeos-rel"
+  }
+}
+job {
+  id: "ci-m84-linux-ozone-rel"
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "linux-ozone-rel"
+  }
+}
+job {
+  id: "ci-m84-mac-osxbeta-rel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-m84"
+    builder: "mac-osxbeta-rel"
+  }
+}
+job {
+  id: "ci-mac-archive-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-archive-dbg"
+  }
+}
+job {
+  id: "ci-mac-archive-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-archive-rel"
+  }
+}
+job {
+  id: "ci-mac-arm64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-arm64"
+  }
+}
+job {
+  id: "ci-mac-code-coverage"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-code-coverage"
+  }
+}
+job {
+  id: "ci-mac-hermetic-upgrade-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-hermetic-upgrade-rel"
+  }
+}
+job {
+  id: "ci-mac-mojo-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-mojo-rel"
+  }
+}
+job {
+  id: "ci-mac-osxbeta-rel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-osxbeta-rel"
+  }
+}
+job {
+  id: "ci-mac-swangle-chromium-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-swangle-chromium-x64"
+  }
+}
+job {
+  id: "ci-win-annotator-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-annotator-rel"
+  }
+}
+job {
+  id: "ci-win-archive-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-archive-dbg"
+  }
+}
+job {
+  id: "ci-win-archive-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-archive-rel"
+  }
+}
+job {
+  id: "ci-win-asan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-asan"
+  }
+}
+job {
+  id: "ci-win-celab-tester-rel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-celab-tester-rel"
+  }
+}
+job {
+  id: "ci-win-pixel-builder-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-pixel-builder-rel"
+  }
+}
+job {
+  id: "ci-win-pixel-tester-rel"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-pixel-tester-rel"
+  }
+}
+job {
+  id: "ci-win-swangle-chromium-x86"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-chromium-x86"
+  }
+}
+job {
+  id: "ci-win-swangle-tot-angle-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-angle-x64"
+  }
+}
+job {
+  id: "ci-win-swangle-tot-angle-x86"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-angle-x86"
+  }
+}
+job {
+  id: "ci-win-swangle-tot-swiftshader-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-swiftshader-x64"
+  }
+}
+job {
+  id: "ci-win-swangle-tot-swiftshader-x86"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-swiftshader-x86"
+  }
+}
+job {
+  id: "ci-win-swangle-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-x64"
+  }
+}
+job {
+  id: "ci-win-swangle-x86"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-x86"
+  }
+}
+job {
+  id: "ci-win10-code-coverage"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win10-code-coverage"
+  }
+}
+job {
+  id: "ci-win32-archive-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win32-archive-dbg"
+  }
+}
+job {
+  id: "ci-win32-archive-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win32-archive-rel"
+  }
+}
+job {
+  id: "ci-win32-arm64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win32-arm64-rel"
+  }
+}
+job {
   id: "fuchsia-arm64-cast"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "fuchsia-arm64-cast"
-  >
->
-job: <
+  }
+}
+job {
+  id: "fuchsia-fyi-arm64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-fyi-arm64-rel"
+  }
+}
+job {
+  id: "fuchsia-fyi-x64-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-fyi-x64-dbg"
+  }
+}
+job {
+  id: "fuchsia-fyi-x64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-fyi-x64-rel"
+  }
+}
+job {
+  id: "fuchsia-official"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-official"
+  }
+}
+job {
   id: "fuchsia-x64-cast"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "fuchsia-x64-cast"
-  >
->
-job: <
+  }
+}
+job {
+  id: "fuchsia-x64-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-x64-dbg"
+  }
+}
+job {
+  id: "ios-asan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-asan"
+  }
+}
+job {
+  id: "ios-device"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-device"
+  }
+}
+job {
+  id: "ios-device-goma-canary-clobber"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "ios-device-goma-canary-clobber"
+  }
+}
+job {
+  id: "ios-device-goma-latest-clobber"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "ios-device-goma-latest-clobber"
+  }
+}
+job {
+  id: "ios-device-goma-rbe-canary-clobber"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "ios-device-goma-rbe-canary-clobber"
+  }
+}
+job {
+  id: "ios-device-goma-rbe-latest-clobber"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "ios-device-goma-rbe-latest-clobber"
+  }
+}
+job {
   id: "ios-simulator"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "ios-simulator"
-  >
->
-job: <
+  }
+}
+job {
+  id: "ios-simulator-code-coverage"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-simulator-code-coverage"
+  }
+}
+job {
+  id: "ios-simulator-cr-recipe"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-simulator-cr-recipe"
+  }
+}
+job {
   id: "ios-simulator-cronet"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "ios-simulator-cronet"
-  >
->
-job: <
+  }
+}
+job {
   id: "ios-simulator-full-configs"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "ios-simulator-full-configs"
-  >
->
-job: <
+  }
+}
+job {
+  id: "ios-simulator-multi-window"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-simulator-multi-window"
+  }
+}
+job {
+  id: "ios-simulator-noncq"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-simulator-noncq"
+  }
+}
+job {
+  id: "ios-webkit-tot"
+  schedule: "0 1-23/6 * * *"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-webkit-tot"
+  }
+}
+job {
+  id: "ios13-beta-simulator"
+  schedule: "0 0,12 * * *"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios13-beta-simulator"
+  }
+}
+job {
+  id: "ios13-sdk-device"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios13-sdk-device"
+  }
+}
+job {
+  id: "ios13-sdk-simulator"
+  schedule: "0 6,18 * * *"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios13-sdk-simulator"
+  }
+}
+job {
+  id: "ios14-beta-simulator"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios14-beta-simulator"
+  }
+}
+job {
+  id: "ios14-sdk-simulator"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios14-sdk-simulator"
+  }
+}
+job {
+  id: "linux-annotator-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-annotator-rel"
+  }
+}
+job {
+  id: "linux-archive-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-archive-dbg"
+  }
+}
+job {
+  id: "linux-archive-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-archive-rel"
+  }
+}
+job {
+  id: "linux-archive-rel-goma-canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "linux-archive-rel-goma-canary"
+  }
+}
+job {
+  id: "linux-archive-rel-goma-canary-localoutputcache"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "linux-archive-rel-goma-canary-localoutputcache"
+  }
+}
+job {
+  id: "linux-archive-rel-goma-latest"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "linux-archive-rel-goma-latest"
+  }
+}
+job {
+  id: "linux-archive-rel-goma-latest-localoutputcache"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "linux-archive-rel-goma-latest-localoutputcache"
+  }
+}
+job {
+  id: "linux-archive-rel-goma-rbe-ats-canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "linux-archive-rel-goma-rbe-ats-canary"
+  }
+}
+job {
+  id: "linux-archive-rel-goma-rbe-ats-latest"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "linux-archive-rel-goma-rbe-ats-latest"
+  }
+}
+job {
+  id: "linux-archive-rel-goma-rbe-canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "linux-archive-rel-goma-rbe-canary"
+  }
+}
+job {
+  id: "linux-archive-rel-goma-rbe-latest"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "linux-archive-rel-goma-rbe-latest"
+  }
+}
+job {
+  id: "linux-bfcache-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-bfcache-rel"
+  }
+}
+job {
+  id: "linux-blink-animation-use-time-delta"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-blink-animation-use-time-delta"
+  }
+}
+job {
+  id: "linux-blink-cors-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-blink-cors-rel"
+  }
+}
+job {
+  id: "linux-blink-heap-concurrent-marking-tsan-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-blink-heap-concurrent-marking-tsan-rel"
+  }
+}
+job {
+  id: "linux-blink-heap-verification"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-blink-heap-verification"
+  }
+}
+job {
+  id: "linux-chromeos-code-coverage"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-chromeos-code-coverage"
+  }
+}
+job {
   id: "linux-chromeos-dbg"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "linux-chromeos-dbg"
-  >
->
-job: <
+  }
+}
+job {
   id: "linux-chromeos-rel"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "linux-chromeos-rel"
-  >
->
-job: <
+  }
+}
+job {
+  id: "linux-chromium-tests-staging-builder"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-chromium-tests-staging-builder"
+  }
+}
+job {
+  id: "linux-chromium-tests-staging-tests"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-chromium-tests-staging-tests"
+  }
+}
+job {
+  id: "linux-fieldtrial-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-fieldtrial-rel"
+  }
+}
+job {
+  id: "linux-gcc-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-gcc-rel"
+  }
+}
+job {
+  id: "linux-official"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-official"
+  }
+}
+job {
   id: "linux-ozone-rel"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "linux-ozone-rel"
-  >
->
-job: <
+  }
+}
+job {
+  id: "linux-perfetto-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-perfetto-rel"
+  }
+}
+job {
+  id: "linux-swangle-chromium-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-chromium-x64"
+  }
+}
+job {
+  id: "linux-swangle-tot-angle-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-angle-x64"
+  }
+}
+job {
+  id: "linux-swangle-tot-angle-x86"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-angle-x86"
+  }
+}
+job {
+  id: "linux-swangle-tot-swiftshader-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-swiftshader-x64"
+  }
+}
+job {
+  id: "linux-swangle-tot-swiftshader-x86"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-swiftshader-x86"
+  }
+}
+job {
+  id: "linux-swangle-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-x64"
+  }
+}
+job {
+  id: "linux-swangle-x86"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-x86"
+  }
+}
+job {
+  id: "linux-trusty-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-trusty-rel"
+  }
+}
+job {
+  id: "linux-upload-perfetto"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-upload-perfetto"
+  }
+}
+job {
+  id: "linux-win_cross-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-win_cross-rel"
+  }
+}
+job {
+  id: "linux-wpt-fyi-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-wpt-fyi-rel"
+  }
+}
+job {
+  id: "linux_chromium_bot_db_exporter"
+  schedule: "0 0,6,12,18 * * *"
+  acl_sets: "findit"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.findit"
+    builder: "linux_chromium_bot_db_exporter"
+  }
+}
+job {
+  id: "linux_chromium_component_updater"
+  schedule: "0 0,6,12,18 * * *"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux_chromium_component_updater"
+  }
+}
+job {
+  id: "mac-archive-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-archive-dbg"
+  }
+}
+job {
+  id: "mac-archive-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-archive-rel"
+  }
+}
+job {
+  id: "mac-archive-rel-goma-canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "mac-archive-rel-goma-canary"
+  }
+}
+job {
+  id: "mac-archive-rel-goma-canary-localoutputcache"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "mac-archive-rel-goma-canary-localoutputcache"
+  }
+}
+job {
+  id: "mac-archive-rel-goma-latest"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "mac-archive-rel-goma-latest"
+  }
+}
+job {
+  id: "mac-archive-rel-goma-latest-localoutputcache"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "mac-archive-rel-goma-latest-localoutputcache"
+  }
+}
+job {
+  id: "mac-archive-rel-goma-rbe-canary"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "mac-archive-rel-goma-rbe-canary"
+  }
+}
+job {
+  id: "mac-archive-rel-goma-rbe-latest"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "mac-archive-rel-goma-rbe-latest"
+  }
+}
+job {
+  id: "mac-arm64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-arm64"
+  }
+}
+job {
+  id: "mac-code-coverage"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-code-coverage"
+  }
+}
+job {
+  id: "mac-hermetic-upgrade-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-hermetic-upgrade-rel"
+  }
+}
+job {
+  id: "mac-mojo-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-mojo-rel"
+  }
+}
+job {
   id: "mac-osxbeta-rel"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
     builder: "mac-osxbeta-rel"
-  >
->
-job: <
-  id: "Android WebView L (dbg)"
-  schedule: "triggered"
-  acls: <
+  }
+}
+job {
+  id: "mac-swangle-chromium-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-swangle-chromium-x64"
+  }
+}
+job {
+  id: "mac-upload-perfetto"
+  schedule: "with 3h interval"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-upload-perfetto"
+  }
+}
+job {
+  id: "win-annotator-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-annotator-rel"
+  }
+}
+job {
+  id: "win-archive-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-archive-dbg"
+  }
+}
+job {
+  id: "win-archive-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-archive-rel"
+  }
+}
+job {
+  id: "win-asan"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-asan"
+  }
+}
+job {
+  id: "win-celab-builder-rel"
+  schedule: "0 0,6,12,18 * * *"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-celab-builder-rel"
+  }
+}
+job {
+  id: "win-celab-tester-rel"
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  noop: <>
->
-job: <
-  id: "Lollipop Phone Tester"
-  schedule: "triggered"
-  acls: <
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-celab-tester-rel"
+  }
+}
+job {
+  id: "win-pixel-builder-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-pixel-builder-rel"
+  }
+}
+job {
+  id: "win-pixel-tester-rel"
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
+  }
   acl_sets: "ci"
-  noop: <>
->
-job: <
-  id: "Lollipop Tablet Tester"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-pixel-tester-rel"
+  }
+}
+job {
+  id: "win-swangle-chromium-x86"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-chromium-x86"
+  }
+}
+job {
+  id: "win-swangle-tot-angle-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-angle-x64"
+  }
+}
+job {
+  id: "win-swangle-tot-angle-x86"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-angle-x86"
+  }
+}
+job {
+  id: "win-swangle-tot-swiftshader-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-swiftshader-x64"
+  }
+}
+job {
+  id: "win-swangle-tot-swiftshader-x86"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-swiftshader-x86"
+  }
+}
+job {
+  id: "win-swangle-x64"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-x64"
+  }
+}
+job {
+  id: "win-swangle-x86"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-x86"
+  }
+}
+job {
+  id: "win-upload-perfetto"
+  schedule: "with 3h interval"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-upload-perfetto"
+  }
+}
+job {
+  id: "win10-code-coverage"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win10-code-coverage"
+  }
+}
+job {
+  id: "win32-archive-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win32-archive-dbg"
+  }
+}
+job {
+  id: "win32-archive-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win32-archive-rel"
+  }
+}
+job {
+  id: "win32-archive-rel-goma-canary-localoutputcache"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "win32-archive-rel-goma-canary-localoutputcache"
+  }
+}
+job {
+  id: "win32-archive-rel-goma-latest-localoutputcache"
+  acl_sets: "goma"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.goma"
+    builder: "win32-archive-rel-goma-latest-localoutputcache"
+  }
+}
+job {
+  id: "win32-arm64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win32-arm64-rel"
+  }
+}
+job {
+  id: "ci-m83-Android WebView L (dbg)"
   schedule: "triggered"
-  acls: <
+  acls {
     role: TRIGGERER
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci"
-  noop: <>
->
-job: <
-  id: "Marshmallow Tablet Tester"
+  }
+  acl_sets: "ci-m83"
+  noop {}
+}
+job {
+  id: "ci-m84-Android WebView L (dbg)"
   schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci"
-  noop: <>
->
-trigger: <
-  id: "chromium-trigger"
-  acl_sets: "ci"
-  triggers: "Android Release (Nexus 5X)"
-  triggers: "Android arm Builder (dbg)"
-  triggers: "Android arm64 Builder (dbg)"
-  triggers: "Android x64 Builder (dbg)"
-  triggers: "Android x86 Builder (dbg)"
-  triggers: "Cast Android (dbg)"
-  triggers: "Cast Linux"
-  triggers: "Dawn Linux x64 DEPS Builder"
-  triggers: "Dawn Mac x64 DEPS Builder"
-  triggers: "Dawn Win10 x64 DEPS Builder"
-  triggers: "Dawn Win10 x86 DEPS Builder"
-  triggers: "Fuchsia ARM64"
-  triggers: "Fuchsia x64"
-  triggers: "GPU Linux Builder"
-  triggers: "GPU Mac Builder"
-  triggers: "GPU Win x64 Builder"
-  triggers: "Linux ASan LSan Builder"
-  triggers: "Linux Builder"
-  triggers: "Linux Builder (dbg)"
-  triggers: "Linux TSan Builder"
-  triggers: "Mac Builder"
-  triggers: "Mac Builder (dbg)"
-  triggers: "VR Linux"
-  triggers: "Win Builder (dbg)"
-  triggers: "Win x64 Builder"
-  triggers: "android-cronet-arm-dbg"
-  triggers: "android-cronet-arm-rel"
-  triggers: "android-lollipop-arm-rel"
-  triggers: "android-marshmallow-arm64-rel"
-  triggers: "android-pie-arm64-rel"
-  triggers: "chromeos-amd64-generic-dbg"
-  triggers: "chromeos-amd64-generic-rel"
-  triggers: "chromeos-arm-generic-rel"
-  triggers: "chromeos-kevin-rel"
-  triggers: "chromeos-kevin-rel-hw-tests"
-  triggers: "fuchsia-arm64-cast"
-  triggers: "fuchsia-x64-cast"
-  triggers: "ios-simulator"
-  triggers: "ios-simulator-cronet"
-  triggers: "ios-simulator-full-configs"
-  triggers: "linux-chromeos-dbg"
-  triggers: "linux-chromeos-rel"
-  triggers: "linux-ozone-rel"
-  gitiles: <
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  noop {}
+}
+job {
+  id: "ci-m83-Lollipop Phone Tester"
+  schedule: "triggered"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  noop {}
+}
+job {
+  id: "ci-m84-Lollipop Phone Tester"
+  schedule: "triggered"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  noop {}
+}
+job {
+  id: "ci-m83-Lollipop Tablet Tester"
+  schedule: "triggered"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  noop {}
+}
+job {
+  id: "ci-m84-Lollipop Tablet Tester"
+  schedule: "triggered"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  noop {}
+}
+job {
+  id: "ci-m83-Marshmallow Tablet Tester"
+  schedule: "triggered"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m83"
+  noop {}
+}
+job {
+  id: "ci-m84-Marshmallow Tablet Tester"
+  schedule: "triggered"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci-m84"
+  noop {}
+}
+trigger {
+  id: "m83-gitiles-trigger"
+  acl_sets: "ci-m83"
+  triggers: "ci-m83-Android Release (Nexus 5X)"
+  triggers: "ci-m83-Android arm Builder (dbg)"
+  triggers: "ci-m83-Android arm64 Builder (dbg)"
+  triggers: "ci-m83-Android x64 Builder (dbg)"
+  triggers: "ci-m83-Android x86 Builder (dbg)"
+  triggers: "ci-m83-Cast Android (dbg)"
+  triggers: "ci-m83-Cast Linux"
+  triggers: "ci-m83-Dawn Linux x64 DEPS Builder"
+  triggers: "ci-m83-Dawn Mac x64 DEPS Builder"
+  triggers: "ci-m83-Dawn Win10 x64 DEPS Builder"
+  triggers: "ci-m83-Dawn Win10 x86 DEPS Builder"
+  triggers: "ci-m83-Fuchsia ARM64"
+  triggers: "ci-m83-Fuchsia x64"
+  triggers: "ci-m83-GPU Linux Builder"
+  triggers: "ci-m83-GPU Mac Builder"
+  triggers: "ci-m83-GPU Win x64 Builder"
+  triggers: "ci-m83-Linux ASan LSan Builder"
+  triggers: "ci-m83-Linux Builder"
+  triggers: "ci-m83-Linux Builder (dbg)"
+  triggers: "ci-m83-Linux TSan Builder"
+  triggers: "ci-m83-Mac Builder"
+  triggers: "ci-m83-Mac Builder (dbg)"
+  triggers: "ci-m83-VR Linux"
+  triggers: "ci-m83-Win Builder (dbg)"
+  triggers: "ci-m83-Win x64 Builder"
+  triggers: "ci-m83-android-cronet-arm-dbg"
+  triggers: "ci-m83-android-cronet-arm-rel"
+  triggers: "ci-m83-android-lollipop-arm-rel"
+  triggers: "ci-m83-android-marshmallow-arm64-rel"
+  triggers: "ci-m83-android-pie-arm64-rel"
+  triggers: "ci-m83-chromeos-amd64-generic-dbg"
+  triggers: "ci-m83-chromeos-amd64-generic-rel"
+  triggers: "ci-m83-chromeos-arm-generic-rel"
+  triggers: "ci-m83-fuchsia-arm64-cast"
+  triggers: "ci-m83-fuchsia-x64-cast"
+  triggers: "ci-m83-ios-simulator"
+  triggers: "ci-m83-ios-simulator-cronet"
+  triggers: "ci-m83-ios-simulator-full-configs"
+  triggers: "ci-m83-linux-chromeos-dbg"
+  triggers: "ci-m83-linux-chromeos-rel"
+  triggers: "ci-m83-linux-ozone-rel"
+  gitiles {
+    repo: "https://chromium.googlesource.com/chromium/src"
+    refs: "regexp:refs/branch-heads/4103"
+  }
+}
+trigger {
+  id: "m84-gitiles-trigger"
+  acl_sets: "ci-m84"
+  triggers: "ci-m84-Android Release (Nexus 5X)"
+  triggers: "ci-m84-Android arm Builder (dbg)"
+  triggers: "ci-m84-Android arm64 Builder (dbg)"
+  triggers: "ci-m84-Android x64 Builder (dbg)"
+  triggers: "ci-m84-Android x86 Builder (dbg)"
+  triggers: "ci-m84-Cast Android (dbg)"
+  triggers: "ci-m84-Cast Linux"
+  triggers: "ci-m84-Dawn Linux x64 DEPS Builder"
+  triggers: "ci-m84-Dawn Mac x64 DEPS Builder"
+  triggers: "ci-m84-Dawn Win10 x64 DEPS Builder"
+  triggers: "ci-m84-Dawn Win10 x86 DEPS Builder"
+  triggers: "ci-m84-Fuchsia ARM64"
+  triggers: "ci-m84-Fuchsia x64"
+  triggers: "ci-m84-GPU Linux Builder"
+  triggers: "ci-m84-GPU Mac Builder"
+  triggers: "ci-m84-GPU Win x64 Builder"
+  triggers: "ci-m84-Linux ASan LSan Builder"
+  triggers: "ci-m84-Linux Builder"
+  triggers: "ci-m84-Linux Builder (dbg)"
+  triggers: "ci-m84-Linux TSan Builder"
+  triggers: "ci-m84-Mac Builder"
+  triggers: "ci-m84-Mac Builder (dbg)"
+  triggers: "ci-m84-VR Linux"
+  triggers: "ci-m84-Win Builder (dbg)"
+  triggers: "ci-m84-Win x64 Builder"
+  triggers: "ci-m84-android-cronet-arm-dbg"
+  triggers: "ci-m84-android-cronet-arm-rel"
+  triggers: "ci-m84-android-lollipop-arm-rel"
+  triggers: "ci-m84-android-marshmallow-arm64-rel"
+  triggers: "ci-m84-android-pie-arm64-rel"
+  triggers: "ci-m84-chromeos-amd64-generic-dbg"
+  triggers: "ci-m84-chromeos-amd64-generic-rel"
+  triggers: "ci-m84-chromeos-arm-generic-rel"
+  triggers: "ci-m84-fuchsia-arm64-cast"
+  triggers: "ci-m84-fuchsia-x64-cast"
+  triggers: "ci-m84-ios-simulator"
+  triggers: "ci-m84-ios-simulator-cronet"
+  triggers: "ci-m84-ios-simulator-full-configs"
+  triggers: "ci-m84-linux-chromeos-dbg"
+  triggers: "ci-m84-linux-chromeos-rel"
+  triggers: "ci-m84-linux-ozone-rel"
+  gitiles {
     repo: "https://chromium.googlesource.com/chromium/src"
     refs: "regexp:refs/branch-heads/4147"
-  >
->
-acl_sets: <
+  }
+}
+trigger {
+  id: "master-gitiles-trigger"
+  acl_sets: "ci"
+  triggers: "ASAN Debug"
+  triggers: "ASAN Release"
+  triggers: "ASAN Release Media"
+  triggers: "ASan Debug (32-bit x86 with V8-ARM)"
+  triggers: "ASan Release (32-bit x86 with V8-ARM)"
+  triggers: "ASan Release Media (32-bit x86 with V8-ARM)"
+  triggers: "Afl Upload Linux ASan"
+  triggers: "Android ASAN (dbg)"
+  triggers: "Android CFI"
+  triggers: "Android FYI 32 Vk Release (Pixel 2)"
+  triggers: "Android FYI 32 dEQP Vk Release (Pixel 2)"
+  triggers: "Android FYI 64 Vk Release (Pixel 2)"
+  triggers: "Android FYI 64 dEQP Vk Release (Pixel 2)"
+  triggers: "Android FYI Release (NVIDIA Shield TV)"
+  triggers: "Android FYI Release (Nexus 5)"
+  triggers: "Android FYI Release (Nexus 5X)"
+  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 SkiaRenderer GL (Nexus 5X)"
+  triggers: "Android FYI SkiaRenderer Vulkan (Pixel 2)"
+  triggers: "Android FYI dEQP Release (Nexus 5X)"
+  triggers: "ci-Android Release (Nexus 5X)"
+  triggers: "Android WebLayer P FYI (rel)"
+  triggers: "Android WebView P Blink-CORS FYI (rel)"
+  triggers: "Android WebView P FYI (rel)"
+  triggers: "ci-Android arm Builder (dbg)"
+  triggers: "ci-Android arm64 Builder (dbg)"
+  triggers: "ci-Android x64 Builder (dbg)"
+  triggers: "ci-Android x86 Builder (dbg)"
+  triggers: "CFI Linux CF"
+  triggers: "CFI Linux ToT"
+  triggers: "ci-Cast Android (dbg)"
+  triggers: "Cast Audio Linux"
+  triggers: "ci-Cast Linux"
+  triggers: "ChromeOS FYI Release (amd64-generic)"
+  triggers: "ChromeOS FYI Release (kevin)"
+  triggers: "ChromiumOS ASAN Release"
+  triggers: "Closure Compilation Linux"
+  triggers: "CrWinAsan"
+  triggers: "CrWinAsan(dll)"
+  triggers: "Dawn Linux x64 Builder"
+  triggers: "ci-Dawn Linux x64 DEPS Builder"
+  triggers: "Dawn Mac x64 Builder"
+  triggers: "ci-Dawn Mac x64 DEPS Builder"
+  triggers: "Dawn Win10 x64 ASAN Release"
+  triggers: "Dawn Win10 x64 Builder"
+  triggers: "ci-Dawn Win10 x64 DEPS Builder"
+  triggers: "Dawn Win10 x86 Builder"
+  triggers: "ci-Dawn Win10 x86 DEPS Builder"
+  triggers: "Deterministic Android"
+  triggers: "Deterministic Android (dbg)"
+  triggers: "Deterministic Fuchsia (dbg)"
+  triggers: "Deterministic Linux"
+  triggers: "Deterministic Linux (dbg)"
+  triggers: "ci-Fuchsia ARM64"
+  triggers: "ci-Fuchsia x64"
+  triggers: "GPU FYI Linux Builder"
+  triggers: "GPU FYI Linux Builder (dbg)"
+  triggers: "GPU FYI Linux Ozone Builder"
+  triggers: "GPU FYI Linux dEQP Builder"
+  triggers: "GPU FYI Mac Builder"
+  triggers: "GPU FYI Mac Builder (dbg)"
+  triggers: "GPU FYI Mac dEQP Builder"
+  triggers: "GPU FYI Perf Android 64 Builder"
+  triggers: "GPU FYI Win Builder"
+  triggers: "GPU FYI Win Builder (dbg)"
+  triggers: "GPU FYI Win dEQP Builder"
+  triggers: "GPU FYI Win x64 Builder"
+  triggers: "GPU FYI Win x64 Builder (dbg)"
+  triggers: "GPU FYI Win x64 DX12 Vulkan Builder"
+  triggers: "GPU FYI Win x64 DX12 Vulkan Builder (dbg)"
+  triggers: "GPU FYI Win x64 dEQP Builder"
+  triggers: "GPU FYI XR Win x64 Builder"
+  triggers: "ci-GPU Linux Builder"
+  triggers: "GPU Linux Builder (dbg)"
+  triggers: "ci-GPU Mac Builder"
+  triggers: "GPU Mac Builder (dbg)"
+  triggers: "ci-GPU Win x64 Builder"
+  triggers: "GPU Win x64 Builder (dbg)"
+  triggers: "Leak Detection Linux"
+  triggers: "Libfuzzer Upload Chrome OS ASan"
+  triggers: "Libfuzzer Upload Linux ASan"
+  triggers: "Libfuzzer Upload Linux ASan Debug"
+  triggers: "Libfuzzer Upload Linux MSan"
+  triggers: "Libfuzzer Upload Linux UBSan"
+  triggers: "Libfuzzer Upload Linux V8-ARM64 ASan"
+  triggers: "Libfuzzer Upload Linux V8-ARM64 ASan Debug"
+  triggers: "Libfuzzer Upload Linux32 ASan"
+  triggers: "Libfuzzer Upload Linux32 ASan Debug"
+  triggers: "Libfuzzer Upload Linux32 V8-ARM ASan"
+  triggers: "Libfuzzer Upload Linux32 V8-ARM ASan Debug"
+  triggers: "Libfuzzer Upload Mac ASan"
+  triggers: "Libfuzzer Upload Windows ASan"
+  triggers: "ci-Linux ASan LSan Builder"
+  triggers: "ci-Linux Builder"
+  triggers: "ci-Linux Builder (dbg)"
+  triggers: "Linux Builder (dbg)(32)"
+  triggers: "Linux CFI"
+  triggers: "Linux Chromium OS ASan LSan Builder"
+  triggers: "Linux ChromiumOS Full"
+  triggers: "Linux ChromiumOS MSan Builder"
+  triggers: "Linux FYI GPU TSAN Release"
+  triggers: "Linux FYI SkiaRenderer Dawn Release (Intel HD 630)"
+  triggers: "Linux MSan Builder"
+  triggers: "ci-Linux TSan Builder"
+  triggers: "Linux Viz"
+  triggers: "Linux remote_run Builder"
+  triggers: "MSAN Release (chained origins)"
+  triggers: "MSAN Release (no origins)"
+  triggers: "Mac ASAN Release"
+  triggers: "Mac ASAN Release Media"
+  triggers: "Mac ASan 64 Builder"
+  triggers: "ci-Mac Builder"
+  triggers: "ci-Mac Builder (dbg)"
+  triggers: "Mac Builder Next"
+  triggers: "Mac FYI GPU ASAN Release"
+  triggers: "Mac deterministic"
+  triggers: "Mac deterministic (dbg)"
+  triggers: "Mojo Android"
+  triggers: "Mojo ChromiumOS"
+  triggers: "Mojo Linux"
+  triggers: "Mojo Windows"
+  triggers: "Network Service Linux"
+  triggers: "Site Isolation Android"
+  triggers: "TSAN Debug"
+  triggers: "TSAN Release"
+  triggers: "ToTAndroid"
+  triggers: "ToTAndroid (dbg)"
+  triggers: "ToTAndroid x64"
+  triggers: "ToTAndroid64"
+  triggers: "ToTAndroidASan"
+  triggers: "ToTAndroidCFI"
+  triggers: "ToTAndroidOfficial"
+  triggers: "ToTLinux"
+  triggers: "ToTLinux (dbg)"
+  triggers: "ToTLinuxASan"
+  triggers: "ToTLinuxASanLibfuzzer"
+  triggers: "ToTLinuxCoverage"
+  triggers: "ToTLinuxMSan"
+  triggers: "ToTLinuxTSan"
+  triggers: "ToTLinuxThinLTO"
+  triggers: "ToTLinuxUBSanVptr"
+  triggers: "ToTMac"
+  triggers: "ToTMac (dbg)"
+  triggers: "ToTMacASan"
+  triggers: "ToTMacCoverage"
+  triggers: "ToTWin(dbg)"
+  triggers: "ToTWin(dll)"
+  triggers: "ToTWin64(dbg)"
+  triggers: "ToTWin64(dll)"
+  triggers: "ToTWinASanLibfuzzer"
+  triggers: "ToTWinCFI"
+  triggers: "ToTWinCFI64"
+  triggers: "ToTiOS"
+  triggers: "ToTiOSDevice"
+  triggers: "UBSan Release"
+  triggers: "UBSan vptr Release"
+  triggers: "UBSanVptr Linux"
+  triggers: "ci-VR Linux"
+  triggers: "WebKit Linux ASAN"
+  triggers: "WebKit Linux Leak"
+  triggers: "WebKit Linux MSAN"
+  triggers: "Win 10 Fast Ring"
+  triggers: "Win ASan Release"
+  triggers: "Win ASan Release Media"
+  triggers: "Win Builder"
+  triggers: "ci-Win Builder (dbg)"
+  triggers: "ci-Win x64 Builder"
+  triggers: "Win x64 Builder (dbg)"
+  triggers: "Win10 FYI x64 SkiaRenderer Dawn Release (NVIDIA)"
+  triggers: "Windows deterministic"
+  triggers: "android-10-arm64-rel"
+  triggers: "android-archive-dbg"
+  triggers: "android-archive-rel"
+  triggers: "android-arm64-proguard-rel"
+  triggers: "android-asan"
+  triggers: "android-bfcache-rel"
+  triggers: "android-binary-size-generator"
+  triggers: "android-code-coverage-native"
+  triggers: "ci-android-cronet-arm-dbg"
+  triggers: "ci-android-cronet-arm-rel"
+  triggers: "android-cronet-arm64-dbg"
+  triggers: "android-cronet-arm64-rel"
+  triggers: "android-cronet-asan-arm-rel"
+  triggers: "android-cronet-marshmallow-arm64-perf-rel"
+  triggers: "android-cronet-x86-dbg"
+  triggers: "android-cronet-x86-rel"
+  triggers: "android-incremental-dbg"
+  triggers: "ci-android-lollipop-arm-rel"
+  triggers: "ci-android-marshmallow-arm64-rel"
+  triggers: "android-marshmallow-x86-fyi-rel"
+  triggers: "android-marshmallow-x86-rel"
+  triggers: "android-mojo-webview-rel"
+  triggers: "android-nougat-arm64-rel"
+  triggers: "android-official"
+  triggers: "ci-android-pie-arm64-rel"
+  triggers: "android-pie-x86-fyi-rel"
+  triggers: "android-pie-x86-rel"
+  triggers: "android-weblayer-pie-x86-fyi-rel"
+  triggers: "chromeos-amd64-generic-asan-rel"
+  triggers: "chromeos-amd64-generic-cfi-thin-lto-rel"
+  triggers: "ci-chromeos-amd64-generic-dbg"
+  triggers: "chromeos-amd64-generic-lacros-rel"
+  triggers: "ci-chromeos-amd64-generic-rel"
+  triggers: "chromeos-arm-generic-dbg"
+  triggers: "ci-chromeos-arm-generic-rel"
+  triggers: "chromeos-kevin-rel"
+  triggers: "ci-fuchsia-arm64-cast"
+  triggers: "fuchsia-fyi-arm64-rel"
+  triggers: "fuchsia-fyi-x64-dbg"
+  triggers: "fuchsia-fyi-x64-rel"
+  triggers: "fuchsia-official"
+  triggers: "ci-fuchsia-x64-cast"
+  triggers: "fuchsia-x64-dbg"
+  triggers: "ios-asan"
+  triggers: "ios-device"
+  triggers: "ci-ios-simulator"
+  triggers: "ios-simulator-code-coverage"
+  triggers: "ios-simulator-cr-recipe"
+  triggers: "ci-ios-simulator-cronet"
+  triggers: "ci-ios-simulator-full-configs"
+  triggers: "ios-simulator-multi-window"
+  triggers: "ios-simulator-noncq"
+  triggers: "ios13-sdk-device"
+  triggers: "ios14-beta-simulator"
+  triggers: "ios14-sdk-simulator"
+  triggers: "linux-annotator-rel"
+  triggers: "linux-archive-dbg"
+  triggers: "linux-archive-rel"
+  triggers: "linux-bfcache-rel"
+  triggers: "linux-blink-animation-use-time-delta"
+  triggers: "linux-blink-cors-rel"
+  triggers: "linux-blink-heap-concurrent-marking-tsan-rel"
+  triggers: "linux-blink-heap-verification"
+  triggers: "ci-linux-chromeos-dbg"
+  triggers: "ci-linux-chromeos-rel"
+  triggers: "linux-chromium-tests-staging-builder"
+  triggers: "linux-fieldtrial-rel"
+  triggers: "linux-gcc-rel"
+  triggers: "linux-official"
+  triggers: "ci-linux-ozone-rel"
+  triggers: "linux-perfetto-rel"
+  triggers: "linux-swangle-chromium-x64"
+  triggers: "linux-swangle-tot-angle-x64"
+  triggers: "linux-swangle-tot-angle-x86"
+  triggers: "linux-swangle-tot-swiftshader-x64"
+  triggers: "linux-swangle-tot-swiftshader-x86"
+  triggers: "linux-swangle-x64"
+  triggers: "linux-swangle-x86"
+  triggers: "linux-trusty-rel"
+  triggers: "linux-upload-perfetto"
+  triggers: "linux-win_cross-rel"
+  triggers: "linux-wpt-fyi-rel"
+  triggers: "mac-archive-dbg"
+  triggers: "mac-archive-rel"
+  triggers: "mac-arm64"
+  triggers: "mac-code-coverage"
+  triggers: "mac-hermetic-upgrade-rel"
+  triggers: "mac-mojo-rel"
+  triggers: "mac-swangle-chromium-x64"
+  triggers: "win-annotator-rel"
+  triggers: "win-archive-dbg"
+  triggers: "win-archive-rel"
+  triggers: "win-asan"
+  triggers: "win-pixel-builder-rel"
+  triggers: "win-swangle-chromium-x86"
+  triggers: "win-swangle-tot-angle-x64"
+  triggers: "win-swangle-tot-angle-x86"
+  triggers: "win-swangle-tot-swiftshader-x64"
+  triggers: "win-swangle-tot-swiftshader-x86"
+  triggers: "win-swangle-x64"
+  triggers: "win-swangle-x86"
+  triggers: "win10-code-coverage"
+  triggers: "win32-archive-dbg"
+  triggers: "win32-archive-rel"
+  triggers: "win32-arm64-rel"
+  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 Staging"
+  triggers: "Chromium Linux Goma RBE Staging (clobber)"
+  triggers: "Chromium Linux Goma RBE Staging (dbg)"
+  triggers: "Chromium Linux Goma RBE Staging (dbg) (clobber)"
+  triggers: "Chromium Linux Goma RBE ToT"
+  triggers: "Chromium Linux Goma RBE ToT (ATS)"
+  triggers: "Chromium Linux Goma Staging"
+  triggers: "Chromium Mac Goma RBE Staging"
+  triggers: "Chromium Mac Goma RBE Staging (clobber)"
+  triggers: "Chromium Mac Goma RBE Staging (dbg)"
+  triggers: "Chromium Mac Goma RBE ToT"
+  triggers: "Chromium Mac Goma Staging"
+  triggers: "Chromium Win Goma RBE Staging"
+  triggers: "Chromium Win Goma RBE Staging (clobber)"
+  triggers: "Chromium Win Goma RBE ToT"
+  triggers: "Chromium iOS Goma RBE ToT"
+  triggers: "CrWinGomaStaging"
+  triggers: "Linux Builder Goma Canary"
+  triggers: "Linux Builder Goma Latest Client"
+  triggers: "Linux Builder Goma RBE Canary"
+  triggers: "Linux Builder Goma RBE Latest Client"
+  triggers: "Mac Builder (dbg) Goma Canary"
+  triggers: "Mac Builder (dbg) Goma Canary (clobber)"
+  triggers: "Mac Builder (dbg) Goma Latest Client"
+  triggers: "Mac Builder (dbg) Goma Latest Client (clobber)"
+  triggers: "Mac Builder (dbg) Goma RBE Canary (clobber)"
+  triggers: "Mac Builder (dbg) Goma RBE Latest Client (clobber)"
+  triggers: "Mac Builder Goma Canary"
+  triggers: "Mac Builder Goma Latest Client"
+  triggers: "Win Builder (dbg) Goma Canary"
+  triggers: "Win Builder (dbg) Goma Latest Client"
+  triggers: "Win Builder (dbg) Goma RBE Latest Client"
+  triggers: "Win Builder Goma Canary"
+  triggers: "Win Builder Goma Latest Client"
+  triggers: "Win Builder Goma RBE Latest Client"
+  triggers: "Win7 Builder (dbg) Goma Canary"
+  triggers: "Win7 Builder (dbg) Goma Latest Client"
+  triggers: "Win7 Builder Goma Canary"
+  triggers: "Win7 Builder Goma Latest Client"
+  triggers: "android-archive-dbg-goma-canary"
+  triggers: "android-archive-dbg-goma-latest"
+  triggers: "android-archive-dbg-goma-rbe-ats-canary"
+  triggers: "android-archive-dbg-goma-rbe-ats-latest"
+  triggers: "android-archive-dbg-goma-rbe-canary"
+  triggers: "android-archive-dbg-goma-rbe-latest"
+  triggers: "chromeos-amd64-generic-rel-goma-canary"
+  triggers: "chromeos-amd64-generic-rel-goma-latest"
+  triggers: "chromeos-amd64-generic-rel-goma-rbe-canary"
+  triggers: "chromeos-amd64-generic-rel-goma-rbe-latest"
+  triggers: "ios-device-goma-canary-clobber"
+  triggers: "ios-device-goma-latest-clobber"
+  triggers: "ios-device-goma-rbe-canary-clobber"
+  triggers: "ios-device-goma-rbe-latest-clobber"
+  triggers: "linux-archive-rel-goma-canary"
+  triggers: "linux-archive-rel-goma-canary-localoutputcache"
+  triggers: "linux-archive-rel-goma-latest"
+  triggers: "linux-archive-rel-goma-latest-localoutputcache"
+  triggers: "linux-archive-rel-goma-rbe-ats-canary"
+  triggers: "linux-archive-rel-goma-rbe-ats-latest"
+  triggers: "linux-archive-rel-goma-rbe-canary"
+  triggers: "linux-archive-rel-goma-rbe-latest"
+  triggers: "mac-archive-rel-goma-canary"
+  triggers: "mac-archive-rel-goma-canary-localoutputcache"
+  triggers: "mac-archive-rel-goma-latest"
+  triggers: "mac-archive-rel-goma-latest-localoutputcache"
+  triggers: "mac-archive-rel-goma-rbe-canary"
+  triggers: "mac-archive-rel-goma-rbe-latest"
+  triggers: "win32-archive-rel-goma-canary-localoutputcache"
+  triggers: "win32-archive-rel-goma-latest-localoutputcache"
+  triggers: "WebRTC Chromium Android Builder"
+  triggers: "WebRTC Chromium Linux Builder"
+  triggers: "WebRTC Chromium Mac Builder"
+  triggers: "WebRTC Chromium Win Builder"
+  gitiles {
+    repo: "https://chromium.googlesource.com/chromium/src"
+    refs: "regexp:refs/heads/master"
+  }
+}
+trigger {
+  id: "webrtc-gitiles-trigger-master"
+  acl_sets: "webrtc"
+  triggers: "WebRTC Chromium FYI Android Builder"
+  triggers: "WebRTC Chromium FYI Android Builder (dbg)"
+  triggers: "WebRTC Chromium FYI Android Builder ARM64 (dbg)"
+  triggers: "WebRTC Chromium FYI Linux Builder"
+  triggers: "WebRTC Chromium FYI Linux Builder (dbg)"
+  triggers: "WebRTC Chromium FYI Mac Builder"
+  triggers: "WebRTC Chromium FYI Mac Builder (dbg)"
+  triggers: "WebRTC Chromium FYI Win Builder"
+  triggers: "WebRTC Chromium FYI Win Builder (dbg)"
+  triggers: "WebRTC Chromium FYI ios-device"
+  triggers: "WebRTC Chromium FYI ios-simulator"
+  gitiles {
+    repo: "https://webrtc.googlesource.com/src/"
+    refs: "regexp:refs/heads/master"
+  }
+}
+acl_sets {
   name: "ci"
-  acls: <
+  acls {
     role: OWNER
     granted_to: "group:project-chromium-admins"
-  >
-  acls: <
+  }
+  acls {
+    granted_to: "group:all"
+  }
+}
+acl_sets {
+  name: "ci-m83"
+  acls {
+    role: OWNER
+    granted_to: "group:project-chromium-admins"
+  }
+  acls {
+    granted_to: "group:all"
+  }
+}
+acl_sets {
+  name: "ci-m84"
+  acls {
+    role: OWNER
+    granted_to: "group:project-chromium-admins"
+  }
+  acls {
+    granted_to: "group:all"
+  }
+}
+acl_sets {
+  name: "findit"
+  acls {
+    role: OWNER
+    granted_to: "group:project-chromium-admins"
+  }
+  acls {
+    granted_to: "group:all"
+  }
+}
+acl_sets {
+  name: "goma"
+  acls {
+    role: OWNER
+    granted_to: "group:project-chromium-admins"
+  }
+  acls {
+    granted_to: "group:all"
+  }
+}
+acl_sets {
+  name: "webrtc"
+  acls {
+    role: OWNER
+    granted_to: "group:project-chromium-admins"
+  }
+  acls {
+    role: OWNER
+    granted_to: "group:project-webrtc-admins"
+  }
+  acls {
+    granted_to: "group:all"
+  }
+}
+acl_sets {
+  name: "webrtc.fyi"
+  acls {
+    role: OWNER
+    granted_to: "group:project-chromium-admins"
+  }
+  acls {
+    role: OWNER
+    granted_to: "group:project-webrtc-admins"
+  }
+  acls {
     granted_to: "group:all"
-  >
->
+  }
+}
diff --git a/chromium/infra/config/generated/project.pyl b/chromium/infra/config/generated/project.pyl
new file mode 100644
index 00000000000..6727fc6162c
--- /dev/null
+++ b/chromium/infra/config/generated/project.pyl
@@ -0,0 +1,3 @@
+# This is a non-LUCI generated file
+# This is consumed by presubmit checks that need to validate the config
+{"validate_source_side_specs_have_builder": True}
diff --git a/chromium/infra/config/generated/realms-dev.cfg b/chromium/infra/config/generated/realms-dev.cfg
new file mode 100644
index 00000000000..d4962917626
--- /dev/null
+++ b/chromium/infra/config/generated/realms-dev.cfg
@@ -0,0 +1,49 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see RealmsCfg message:
+#   https://luci-config.appspot.com/schemas/projects:realms.cfg
+
+realms {
+  name: "@root"
+  bindings {
+    role: "role/configs.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/logdog.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/logdog.writer"
+    principals: "group:luci-logdog-chromium-dev-writers"
+  }
+  bindings {
+    role: "role/scheduler.owner"
+    principals: "group:project-chromium-admins"
+  }
+  bindings {
+    role: "role/scheduler.reader"
+    principals: "group:all"
+  }
+}
+realms {
+  name: "ci"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.owner"
+    principals: "group:google/luci-task-force@google.com"
+  }
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "user:chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
+    principals: "user:luci-scheduler-dev@appspot.gserviceaccount.com"
+  }
+}
diff --git a/chromium/infra/config/generated/realms.cfg b/chromium/infra/config/generated/realms.cfg
new file mode 100644
index 00000000000..bd1bbd83b17
--- /dev/null
+++ b/chromium/infra/config/generated/realms.cfg
@@ -0,0 +1,249 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see RealmsCfg message:
+#   https://luci-config.appspot.com/schemas/projects:realms.cfg
+
+realms {
+  name: "@root"
+  bindings {
+    role: "role/configs.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/logdog.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/logdog.writer"
+    principals: "group:luci-logdog-chromium-writers"
+  }
+  bindings {
+    role: "role/scheduler.owner"
+    principals: "group:project-chromium-admins"
+  }
+  bindings {
+    role: "role/scheduler.reader"
+    principals: "group:all"
+  }
+}
+realms {
+  name: "ci"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+    principals: "user:chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+    principals: "user:chromium-cipd-builder@chops-service-accounts.iam.gserviceaccount.com"
+    principals: "user:component-mapping-updater@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.owner"
+    principals: "group:google/luci-task-force@google.com"
+  }
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-chromium-ci-schedulers"
+  }
+}
+realms {
+  name: "ci-m83"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+    principals: "user:chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.owner"
+    principals: "group:google/luci-task-force@google.com"
+  }
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-chromium-ci-schedulers"
+  }
+}
+realms {
+  name: "ci-m84"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+    principals: "user:chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.owner"
+    principals: "group:google/luci-task-force@google.com"
+  }
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-chromium-ci-schedulers"
+  }
+}
+realms {
+  name: "findit"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:findit-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:googlers"
+    principals: "user:findit-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:findit-tryjob-access"
+    principals: "user:luci-scheduler@appspot.gserviceaccount.com"
+  }
+}
+realms {
+  name: "goma"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.owner"
+    principals: "group:google/luci-task-force@google.com"
+  }
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-chromium-ci-schedulers"
+  }
+}
+realms {
+  name: "try"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+    principals: "user:chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.owner"
+    principals: "group:service-account-chromium-tryserver"
+  }
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-chromium-tryjob-access"
+    principals: "group:service-account-chromeperf"
+    principals: "group:service-account-cq"
+    principals: "project:angle"
+    principals: "project:dawn"
+    principals: "project:skia"
+    principals: "project:v8"
+    principals: "user:findit-for-me@appspot.gserviceaccount.com"
+    principals: "user:tricium-prod@appspot.gserviceaccount.com"
+  }
+}
+realms {
+  name: "try-m83"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+    principals: "user:chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.owner"
+    principals: "group:service-account-chromium-tryserver"
+  }
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-chromium-tryjob-access"
+    principals: "group:service-account-chromeperf"
+    principals: "group:service-account-cq"
+    principals: "user:findit-for-me@appspot.gserviceaccount.com"
+    principals: "user:tricium-prod@appspot.gserviceaccount.com"
+  }
+}
+realms {
+  name: "try-m84"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+    principals: "user:chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.owner"
+    principals: "group:service-account-chromium-tryserver"
+  }
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-chromium-tryjob-access"
+    principals: "group:service-account-chromeperf"
+    principals: "group:service-account-cq"
+    principals: "user:findit-for-me@appspot.gserviceaccount.com"
+    principals: "user:tricium-prod@appspot.gserviceaccount.com"
+  }
+}
+realms {
+  name: "webrtc"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.owner"
+    principals: "group:google/luci-task-force@google.com"
+  }
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-chromium-ci-schedulers"
+  }
+  bindings {
+    role: "role/scheduler.owner"
+    principals: "group:project-webrtc-admins"
+  }
+}
+realms {
+  name: "webrtc.fyi"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.owner"
+    principals: "group:google/luci-task-force@google.com"
+  }
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-chromium-ci-schedulers"
+  }
+  bindings {
+    role: "role/scheduler.owner"
+    principals: "group:project-webrtc-admins"
+  }
+}