projects / platform / framework / web / crosswalk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git] / src / third_party / chromite / cbuildbot / config_dump.json
diff --git a/src/third_party/chromite/cbuildbot/config_dump.json b/src/third_party/chromite/cbuildbot/config_dump.json
index c4404b0..51dba44 100644 (file)
--- a/src/third_party/chromite/cbuildbot/config_dump.json
+++ b/src/third_party/chromite/cbuildbot/config_dump.json
@@ -1496,7 +1496,7 @@
         "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
-        "disk_layout": null,
+        "disk_layout": "2gb-rootfs",
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
         "factory_toolkit": true,
@@ -1512,7 +1512,7 @@
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
@@ -1554,9 +1554,7 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
     "amd64-generic_freon-full": {
         "afdo_generate": false,
@@ -1750,9 +1748,7 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
     "amd64-generic_freon-tot-chromium-pfq-informational": {
         "afdo_generate": false,
@@ -2476,7 +2472,7 @@
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
@@ -10002,102 +9998,7 @@
             "smoke_suite"
         ]
     },
-    "branch-util": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "gardener",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Used for creating/deleting branches (TPMs only)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": true,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "branch-util",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": false,
-        "postsync_reexec": false,
-        "pre_cq": false,
-        "prebuilts": "private",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "butterfly-chrome-pfq": {
+    "bobcat-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -10109,7 +10010,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "butterfly"
+            "bobcat"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -10155,7 +10056,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "butterfly-chrome-pfq",
+        "name": "bobcat-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -10196,7 +10097,7 @@
             "pfq_suite"
         ]
     },
-    "butterfly-chromium-pfq": {
+    "bobcat-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -10208,7 +10109,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "butterfly"
+            "bobcat"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -10254,7 +10155,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "butterfly-chromium-pfq",
+        "name": "bobcat-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -10293,106 +10194,7 @@
             "pfq_suite"
         ]
     },
-    "butterfly-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "butterfly"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Canary",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "butterfly-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "butterfly-full": {
+    "bobcat-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -10404,7 +10206,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "butterfly"
+            "bobcat"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -10452,7 +10254,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "butterfly-full",
+        "name": "bobcat-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -10491,199 +10293,7 @@
             "pfq_suite"
         ]
     },
-    "butterfly-paladin": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": true,
-        "boards": [
-            "butterfly"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "paladin",
-        "child_configs": [],
-        "chrome_binhost_only": true,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Commit Queue (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": true,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "butterfly-paladin",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": "butterfly paladin",
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "private",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "butterfly-payloads": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "butterfly"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "payloads",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Regenerate release payloads.",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "butterfly-payloads",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "butterfly-release": {
+    "bobcat-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -10695,7 +10305,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "butterfly"
+            "bobcat"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -10728,12 +10338,7 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": true,
         "image_test": true,
         "images": [
@@ -10748,25 +10353,25 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "butterfly-release",
+        "name": "bobcat-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
         "prebuilts": false,
-        "profile": null,
+        "profile": "minimal",
         "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": true,
@@ -10793,7 +10398,7 @@
             "cros_vm_test"
         ]
     },
-    "butterfly-release-afdo": {
+    "bobcat-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -10805,7 +10410,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "butterfly"
+            "bobcat"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -10825,7 +10430,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "butterfly"
+                    "bobcat"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -10880,7 +10485,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "butterfly-release-afdo-generate",
+                "name": "bobcat-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -10937,7 +10542,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "butterfly"
+                    "bobcat"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -10992,7 +10597,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "butterfly-release-afdo-use",
+                "name": "bobcat-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -11085,7 +10690,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "butterfly-release-afdo",
+        "name": "bobcat-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -11130,7 +10735,7 @@
             "cros_vm_test"
         ]
     },
-    "butterfly-release-afdo-generate": {
+    "bobcat-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -11142,7 +10747,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "butterfly"
+            "bobcat"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -11197,7 +10802,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "butterfly-release-afdo-generate",
+        "name": "bobcat-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -11242,7 +10847,7 @@
             "cros_vm_test"
         ]
     },
-    "butterfly-release-afdo-use": {
+    "bobcat-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -11254,7 +10859,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "butterfly"
+            "bobcat"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -11309,7 +10914,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "butterfly-release-afdo-use",
+        "name": "bobcat-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -11354,7 +10959,7 @@
             "cros_vm_test"
         ]
     },
-    "butterfly-tot-chrome-pfq-informational": {
+    "bobcat-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -11366,7 +10971,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "butterfly"
+            "bobcat"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -11412,7 +11017,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "butterfly-tot-chrome-pfq-informational",
+        "name": "bobcat-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -11453,7 +11058,7 @@
             "smoke_suite"
         ]
     },
-    "butterfly-tot-chromium-pfq-informational": {
+    "bobcat-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -11465,7 +11070,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "butterfly"
+            "bobcat"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -11511,7 +11116,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "butterfly-tot-chromium-pfq-informational",
+        "name": "bobcat-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -11550,7 +11155,7 @@
             "smoke_suite"
         ]
     },
-    "candy-chrome-pfq": {
+    "branch-util": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -11561,28 +11166,26 @@
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
-        "boards": [
-            "candy"
-        ],
+        "boards": [],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "gardener",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Used for creating/deleting branches (TPMs only)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -11601,22 +11204,22 @@
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "candy-chrome-pfq",
+        "name": "branch-util",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
+        "postsync_patch": false,
+        "postsync_reexec": false,
         "pre_cq": false,
         "prebuilts": "private",
         "profile": null,
@@ -11629,13 +11232,13 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -11645,11 +11248,9 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "candy-chromium-pfq": {
+    "butterfly-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -11661,7 +11262,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "candy"
+            "butterfly"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -11674,14 +11275,14 @@
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -11707,7 +11308,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "candy-chromium-pfq",
+        "name": "butterfly-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -11717,7 +11318,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -11738,7 +11339,9 @@
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
@@ -11746,126 +11349,29 @@
             "pfq_suite"
         ]
     },
-    "candy-depthcharge-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "candy"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Canary",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "candy-depthcharge-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "depthcharge"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "candy-depthcharge-full-firmware": {
+    "butterfly-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "candy"
+            "butterfly"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "full",
+        "build_tests": true,
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -11875,15 +11381,15 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Informational",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
@@ -11891,19 +11397,19 @@
         "hw_tests": [],
         "hwqual": false,
         "image_test": false,
-        "images": [],
+        "images": [
+            "test"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "candy-depthcharge-full-firmware",
+        "name": "butterfly-chromium-pfq",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -11911,7 +11417,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -11920,27 +11426,27 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
+        "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "depthcharge"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "candy-firmware": {
+    "butterfly-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -11952,7 +11458,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "candy"
+            "butterfly"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -11996,7 +11502,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "candy-firmware",
+        "name": "butterfly-firmware",
         "overlays": "both",
         "packages": [
             "virtual/chromeos-firmware"
@@ -12039,7 +11545,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "candy-full": {
+    "butterfly-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -12051,7 +11557,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "candy"
+            "butterfly"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -12099,7 +11605,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "candy-full",
+        "name": "butterfly-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -12138,7 +11644,7 @@
             "pfq_suite"
         ]
     },
-    "candy-paladin": {
+    "butterfly-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -12148,9 +11654,9 @@
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
-        "board_replace": false,
+        "board_replace": true,
         "boards": [
-            "candy"
+            "butterfly"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -12158,7 +11664,7 @@
         "build_tests": true,
         "build_type": "paladin",
         "child_configs": [],
-        "chrome_binhost_only": false,
+        "chrome_binhost_only": true,
         "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": false,
@@ -12189,17 +11695,17 @@
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "candy-paladin",
+        "name": "butterfly-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "candy paladin",
+        "paladin_builder_name": "butterfly paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -12235,7 +11741,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "candy-payloads": {
+    "butterfly-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -12247,7 +11753,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "candy"
+            "butterfly"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -12293,7 +11799,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "candy-payloads",
+        "name": "butterfly-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -12330,7 +11836,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "candy-release": {
+    "butterfly-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -12342,7 +11848,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "candy"
+            "butterfly"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -12395,7 +11901,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "candy-release",
+        "name": "butterfly-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -12440,7 +11946,7 @@
             "cros_vm_test"
         ]
     },
-    "candy-release-afdo": {
+    "butterfly-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -12452,7 +11958,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "candy"
+            "butterfly"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -12472,7 +11978,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "candy"
+                    "butterfly"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -12527,7 +12033,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "candy-release-afdo-generate",
+                "name": "butterfly-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -12584,7 +12090,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "candy"
+                    "butterfly"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -12639,7 +12145,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "candy-release-afdo-use",
+                "name": "butterfly-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -12732,7 +12238,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "candy-release-afdo",
+        "name": "butterfly-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -12777,7 +12283,7 @@
             "cros_vm_test"
         ]
     },
-    "candy-release-afdo-generate": {
+    "butterfly-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -12789,7 +12295,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "candy"
+            "butterfly"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -12844,7 +12350,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "candy-release-afdo-generate",
+        "name": "butterfly-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -12889,7 +12395,7 @@
             "cros_vm_test"
         ]
     },
-    "candy-release-afdo-use": {
+    "butterfly-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -12901,7 +12407,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "candy"
+            "butterfly"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -12956,7 +12462,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "candy-release-afdo-use",
+        "name": "butterfly-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -13001,7 +12507,7 @@
             "cros_vm_test"
         ]
     },
-    "candy-tot-chrome-pfq-informational": {
+    "butterfly-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -13013,7 +12519,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "candy"
+            "butterfly"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -13059,7 +12565,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "candy-tot-chrome-pfq-informational",
+        "name": "butterfly-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -13100,7 +12606,7 @@
             "smoke_suite"
         ]
     },
-    "candy-tot-chromium-pfq-informational": {
+    "butterfly-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -13112,7 +12618,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "candy"
+            "butterfly"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -13158,7 +12664,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "candy-tot-chromium-pfq-informational",
+        "name": "butterfly-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -13197,41 +12703,39 @@
             "smoke_suite"
         ]
     },
-    "chromiumos-sdk": {
+    "candy-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "x86-generic",
-            "arm-generic",
-            "amd64-generic"
+            "candy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chroot",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Build the SDK and all the cross-compilers",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -13239,28 +12743,26 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "chromiumos-sdk",
-        "overlays": "public",
+        "name": "candy-chrome-pfq",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -13269,7 +12771,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -13280,25 +12782,27 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
-        "use_sdk": false,
-        "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": [
             "pfq_suite"
         ]
     },
-    "clapper-chrome-pfq": {
+    "candy-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -13310,7 +12814,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "clapper"
+            "candy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -13323,14 +12827,14 @@
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -13356,7 +12860,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "clapper-chrome-pfq",
+        "name": "candy-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -13366,7 +12870,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -13387,9 +12891,7 @@
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
@@ -13397,29 +12899,126 @@
             "pfq_suite"
         ]
     },
-    "clapper-chromium-pfq": {
+    "candy-depthcharge-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "candy"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "candy-depthcharge-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "depthcharge"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "candy-depthcharge-full-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "clapper"
+            "candy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
+        "build_tests": false,
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -13429,15 +13028,15 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Firmware Informational",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
@@ -13445,19 +13044,19 @@
         "hw_tests": [],
         "hwqual": false,
         "image_test": false,
-        "images": [
-            "test"
-        ],
+        "images": [],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_version": false,
         "master": false,
-        "name": "clapper-chromium-pfq",
+        "name": "candy-depthcharge-full-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -13465,7 +13064,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -13474,27 +13073,27 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
+        "sync_chrome": false,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "depthcharge"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "clapper-depthcharge-firmware": {
+    "candy-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -13506,7 +13105,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "clapper"
+            "candy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -13550,201 +13149,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "clapper-depthcharge-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "depthcharge"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "clapper-depthcharge-full-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "clapper"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "full",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Informational",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": true,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
-        "master": false,
-        "name": "clapper-depthcharge-full-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "depthcharge"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "clapper-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "clapper"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Canary",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "clapper-firmware",
+        "name": "candy-firmware",
         "overlays": "both",
         "packages": [
             "virtual/chromeos-firmware"
@@ -13787,7 +13192,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "clapper-full": {
+    "candy-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -13799,7 +13204,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "clapper"
+            "candy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -13847,7 +13252,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "clapper-full",
+        "name": "candy-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -13886,7 +13291,7 @@
             "pfq_suite"
         ]
     },
-    "clapper-paladin": {
+    "candy-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -13898,7 +13303,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "clapper"
+            "candy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -13944,10 +13349,10 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "clapper-paladin",
+        "name": "candy-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "clapper paladin",
+        "paladin_builder_name": "candy paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -13983,7 +13388,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "clapper-payloads": {
+    "candy-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -13995,7 +13400,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "clapper"
+            "candy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -14041,7 +13446,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "clapper-payloads",
+        "name": "candy-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -14078,7 +13483,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "clapper-release": {
+    "candy-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -14090,7 +13495,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "clapper"
+            "candy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -14143,7 +13548,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "clapper-release",
+        "name": "candy-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -14188,7 +13593,7 @@
             "cros_vm_test"
         ]
     },
-    "clapper-release-afdo": {
+    "candy-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -14200,7 +13605,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "clapper"
+            "candy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -14220,7 +13625,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "clapper"
+                    "candy"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -14275,7 +13680,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "clapper-release-afdo-generate",
+                "name": "candy-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -14332,7 +13737,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "clapper"
+                    "candy"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -14387,7 +13792,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "clapper-release-afdo-use",
+                "name": "candy-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -14480,7 +13885,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "clapper-release-afdo",
+        "name": "candy-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -14525,7 +13930,7 @@
             "cros_vm_test"
         ]
     },
-    "clapper-release-afdo-generate": {
+    "candy-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -14537,7 +13942,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "clapper"
+            "candy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -14592,7 +13997,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "clapper-release-afdo-generate",
+        "name": "candy-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -14637,7 +14042,7 @@
             "cros_vm_test"
         ]
     },
-    "clapper-release-afdo-use": {
+    "candy-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -14649,7 +14054,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "clapper"
+            "candy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -14704,7 +14109,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "clapper-release-afdo-use",
+        "name": "candy-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -14749,7 +14154,7 @@
             "cros_vm_test"
         ]
     },
-    "clapper-tot-chrome-pfq-informational": {
+    "candy-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -14761,7 +14166,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "clapper"
+            "candy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -14807,7 +14212,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "clapper-tot-chrome-pfq-informational",
+        "name": "candy-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -14848,7 +14253,7 @@
             "smoke_suite"
         ]
     },
-    "clapper-tot-chromium-pfq-informational": {
+    "candy-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -14860,7 +14265,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "clapper"
+            "candy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -14906,7 +14311,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "clapper-tot-chromium-pfq-informational",
+        "name": "candy-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -14945,7 +14350,108 @@
             "smoke_suite"
         ]
     },
-    "cranky-chrome-pfq": {
+    "chromiumos-sdk": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "x86-generic",
+            "arm-generic",
+            "amd64-generic"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chroot",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Build the SDK and all the cross-compilers",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "chromiumos-sdk",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": false,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "clapper-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -14957,7 +14463,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "cranky"
+            "clapper"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -15003,7 +14509,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "cranky-chrome-pfq",
+        "name": "clapper-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -15044,7 +14550,7 @@
             "pfq_suite"
         ]
     },
-    "cranky-chromium-pfq": {
+    "clapper-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -15056,7 +14562,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "cranky"
+            "clapper"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -15102,7 +14608,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "cranky-chromium-pfq",
+        "name": "clapper-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -15141,7 +14647,104 @@
             "pfq_suite"
         ]
     },
-    "cranky-full": {
+    "clapper-depthcharge-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "clapper"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "clapper-depthcharge-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "depthcharge"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "clapper-depthcharge-full-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -15153,7 +14756,203 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "cranky"
+            "clapper"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "full",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Informational",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": false,
+        "master": false,
+        "name": "clapper-depthcharge-full-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "depthcharge"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "clapper-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "clapper"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "clapper-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "clapper-full": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "clapper"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -15201,7 +15000,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "cranky-full",
+        "name": "clapper-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -15240,7 +15039,7 @@
             "pfq_suite"
         ]
     },
-    "cranky-paladin": {
+    "clapper-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -15252,7 +15051,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "cranky"
+            "clapper"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -15298,10 +15097,10 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "cranky-paladin",
+        "name": "clapper-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "cranky paladin",
+        "paladin_builder_name": "clapper paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -15337,7 +15136,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "cranky-payloads": {
+    "clapper-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -15349,7 +15148,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "cranky"
+            "clapper"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -15395,7 +15194,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "cranky-payloads",
+        "name": "clapper-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -15432,7 +15231,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "cranky-release": {
+    "clapper-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -15444,7 +15243,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "cranky"
+            "clapper"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -15497,7 +15296,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "cranky-release",
+        "name": "clapper-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -15542,7 +15341,7 @@
             "cros_vm_test"
         ]
     },
-    "cranky-release-afdo": {
+    "clapper-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -15554,7 +15353,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "cranky"
+            "clapper"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -15574,7 +15373,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "cranky"
+                    "clapper"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -15629,7 +15428,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "cranky-release-afdo-generate",
+                "name": "clapper-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -15686,7 +15485,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "cranky"
+                    "clapper"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -15741,7 +15540,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "cranky-release-afdo-use",
+                "name": "clapper-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -15834,7 +15633,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "cranky-release-afdo",
+        "name": "clapper-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -15879,7 +15678,7 @@
             "cros_vm_test"
         ]
     },
-    "cranky-release-afdo-generate": {
+    "clapper-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -15891,7 +15690,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "cranky"
+            "clapper"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -15946,7 +15745,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "cranky-release-afdo-generate",
+        "name": "clapper-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -15991,7 +15790,7 @@
             "cros_vm_test"
         ]
     },
-    "cranky-release-afdo-use": {
+    "clapper-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -16003,7 +15802,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "cranky"
+            "clapper"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -16058,7 +15857,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "cranky-release-afdo-use",
+        "name": "clapper-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -16103,7 +15902,7 @@
             "cros_vm_test"
         ]
     },
-    "cranky-tot-chrome-pfq-informational": {
+    "clapper-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -16115,7 +15914,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "cranky"
+            "clapper"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -16161,7 +15960,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "cranky-tot-chrome-pfq-informational",
+        "name": "clapper-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -16202,7 +16001,7 @@
             "smoke_suite"
         ]
     },
-    "cranky-tot-chromium-pfq-informational": {
+    "clapper-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -16214,7 +16013,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "cranky"
+            "clapper"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -16260,7 +16059,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "cranky-tot-chromium-pfq-informational",
+        "name": "clapper-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -16299,107 +16098,7 @@
             "smoke_suite"
         ]
     },
-    "daisy-chrome-perf": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "daisy"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Chrome Performance test bot",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": true,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 5400,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
-        "master": false,
-        "name": "daisy-chrome-perf",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
-        "use_chrome_lkgm": true,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "daisy-chrome-pfq": {
+    "cranky-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -16411,7 +16110,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy"
+            "cranky"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -16457,7 +16156,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy-chrome-pfq",
+        "name": "cranky-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -16477,10 +16176,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -16494,9 +16193,11 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "daisy-chromium-pfq": {
+    "cranky-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -16508,7 +16209,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy"
+            "cranky"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -16547,14 +16248,14 @@
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy-chromium-pfq",
+        "name": "cranky-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -16574,10 +16275,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -16589,209 +16290,11 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "daisy-factory": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "daisy"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Factory Builds",
-        "dev_installer_prebuilts": true,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "daisy-factory",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "daisy-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "daisy"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Canary",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "daisy-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": false,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "daisy-full": {
+    "cranky-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -16803,7 +16306,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy"
+            "cranky"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -16851,7 +16354,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "daisy-full",
+        "name": "cranky-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -16871,10 +16374,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -16886,324 +16389,34 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "daisy-full-group": {
+    "cranky-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy"
+            "cranky"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "daisy"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "daisy-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "daisy_spring"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "daisy_spring-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "daisy_skate"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "daisy_skate-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "build_type": "paladin",
+        "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
@@ -17212,7 +16425,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds; Group config (boards: daisy, daisy_spring, daisy_skate)",
+        "description": "Commit Queue (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -17220,37 +16433,35 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "daisy-full-group",
-        "overlays": "public",
+        "name": "cranky-paladin",
+        "overlays": "both",
         "packages": [],
-        "paladin_builder_name": null,
+        "paladin_builder_name": "cranky paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -17260,24 +16471,26 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy-incremental": {
+    "cranky-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -17289,13 +16502,13 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy"
+            "cranky"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "binary",
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
@@ -17309,7 +16522,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Incremental Builds",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -17329,17 +16542,17 @@
             "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "daisy-incremental",
-        "overlays": "public",
+        "name": "cranky-payloads",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -17355,14 +16568,14 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
+        "unittests": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -17372,40 +16585,40 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy-paladin": {
+    "cranky-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy"
+            "cranky"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue (internal)",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -17418,274 +16631,83 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
         ],
-        "hwqual": false,
-        "image_test": false,
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy-paladin",
+        "name": "cranky-release",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "daisy paladin",
-        "paygen": false,
+        "paladin_builder_name": null,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
-        "upload_symbols": false,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "daisy-payloads": {
+    "cranky-release-afdo": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "payloads",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Regenerate release payloads.",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "daisy-payloads",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "daisy-release": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": true,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "daisy"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": true,
-        "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "daisy-release",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "daisy-release-afdo": {
-        "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "daisy"
+            "cranky"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -17705,7 +16727,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "daisy"
+                    "cranky"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -17760,7 +16782,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "daisy-release-afdo-generate",
+                "name": "cranky-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -17780,10 +16802,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": false,
+                "tests_supported": true,
                 "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": false,
+                "unittests": true,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -17799,7 +16821,11 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": []
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
             },
             {
                 "afdo_generate": false,
@@ -17813,7 +16839,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "daisy"
+                    "cranky"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -17868,7 +16894,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "daisy-release-afdo-use",
+                "name": "cranky-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -17888,10 +16914,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": false,
+                "tests_supported": true,
                 "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": false,
+                "unittests": true,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -17907,7 +16933,11 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": []
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
             }
         ],
         "chrome_binhost_only": false,
@@ -17957,7 +16987,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy-release-afdo",
+        "name": "cranky-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -17977,10 +17007,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -17996,9 +17026,13 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "daisy-release-afdo-generate": {
+    "cranky-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -18010,7 +17044,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy"
+            "cranky"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -18065,7 +17099,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy-release-afdo-generate",
+        "name": "cranky-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -18085,10 +17119,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -18104,9 +17138,13 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "daisy-release-afdo-use": {
+    "cranky-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -18118,7 +17156,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy"
+            "cranky"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -18173,7 +17211,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy-release-afdo-use",
+        "name": "cranky-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -18193,10 +17231,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -18212,18 +17250,218 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "daisy-release-group": {
+    "cranky-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "cranky"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Informational Chrome Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": false,
+        "master": false,
+        "name": "cranky-tot-chrome-pfq-informational",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": true,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite"
+        ]
+    },
+    "cranky-tot-chromium-pfq-informational": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "cranky"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Informational Chromium Uprev & Build (public)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "cranky-tot-chromium-pfq-informational",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": true,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite"
+        ]
+    },
+    "daisy-chrome-perf": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
             "daisy"
@@ -18232,330 +17470,11 @@
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "daisy"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": true,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "daisy-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "daisy_spring"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "daisy_spring-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "daisy_skate"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "daisy_skate-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "build_type": "chrome",
+        "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -18563,10 +17482,10 @@
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
-        "critical_for_chrome": true,
+        "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal); Group config (boards: daisy, daisy_spring, daisy_skate)",
-        "dev_installer_prebuilts": true,
+        "description": "Chrome Performance test bot",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -18579,30 +17498,25 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": true,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 5400,\n    \"warn_only\": false\n}"
         ],
-        "hwqual": true,
-        "image_test": true,
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_version": false,
         "master": false,
-        "name": "daisy-release-group",
+        "name": "daisy-chrome-perf",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -18610,13 +17524,13 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
         "trybot_list": true,
@@ -18624,22 +17538,21 @@
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
-        "use_chrome_lkgm": false,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": true,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
             "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
+            "-cros-debug"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy-tot-chrome-pfq-informational": {
+    "daisy-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -18660,18 +17573,18 @@
         "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -18691,14 +17604,14 @@
             "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "daisy-tot-chrome-pfq-informational",
-        "overlays": "public",
+        "name": "daisy-chrome-pfq",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -18707,7 +17620,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -18726,15 +17639,17 @@
         "upload_symbols": false,
         "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy-tot-chromium-pfq-informational": {
+    "daisy-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -18755,8 +17670,8 @@
         "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -18766,7 +17681,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -18785,15 +17700,15 @@
         "images": [
             "test"
         ],
-        "important": false,
-        "internal": false,
+        "important": true,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "daisy-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "name": "daisy-chromium-pfq",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -18802,7 +17717,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -18821,7 +17736,7 @@
         "upload_symbols": false,
         "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
         "usepkg_build_packages": true,
@@ -18829,16 +17744,16 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy-webrtc-chrome-pfq-informational": {
+    "daisy-factory": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
             "daisy"
@@ -18847,10 +17762,10 @@
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
+        "chrome_rev": null,
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -18861,8 +17776,8 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chrome Uprev & Build (internal)",
-        "dev_installer_prebuilts": false,
+        "description": "Factory Builds",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -18875,19 +17790,21 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "daisy-webrtc-chrome-pfq-informational",
+        "name": "daisy-factory",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -18899,43 +17816,45 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
-        "upload_hw_test_artifacts": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy-webrtc-chromium-pfq-informational": {
+    "daisy-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
             "daisy"
@@ -18943,28 +17862,28 @@
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
+        "build_tests": false,
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
+        "chrome_rev": null,
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Firmware Canary",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -18972,21 +17891,21 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": false,
+        "hwqual": true,
         "image_test": false,
-        "images": [
-            "test"
-        ],
+        "images": [],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "daisy-webrtc-chromium-pfq-informational",
-        "overlays": "public",
-        "packages": [],
+        "name": "daisy-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -18996,64 +17915,68 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
+        "sync_chrome": false,
         "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
-        "upload_hw_test_artifacts": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_freon-chrome-pfq": {
+    "daisy-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_freon"
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -19061,26 +17984,28 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "daisy_freon-chrome-pfq",
-        "overlays": "both",
+        "name": "daisy-full",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -19089,7 +18014,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -19100,46 +18025,336 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_freon-chromium-pfq": {
+    "daisy-full-group": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_freon"
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
-        "child_configs": [],
+        "build_type": "full",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "daisy"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "daisy-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "daisy_spring"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "daisy_spring-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "daisy_skate"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "daisy_skate-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -19150,7 +18365,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Full Builds; Group config (boards: daisy, daisy_spring, daisy_skate)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -19158,26 +18373,28 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "daisy_freon-chromium-pfq",
-        "overlays": "both",
+        "name": "daisy-full-group",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -19197,55 +18414,55 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_freon-full": {
+    "daisy-incremental": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_freon"
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "binary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": true,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
+        "description": "Incremental Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -19253,18 +18470,16 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": false,
@@ -19273,7 +18488,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "daisy_freon-full",
+        "name": "daisy-incremental",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -19283,7 +18498,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -19294,23 +18509,23 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_freon-paladin": {
+    "daisy-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -19322,7 +18537,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_freon"
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -19355,23 +18570,26 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": false,
         "image_test": false,
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_freon-paladin",
+        "name": "daisy-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "daisy_freon paladin",
+        "paladin_builder_name": "daisy paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -19407,7 +18625,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_freon-payloads": {
+    "daisy-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -19419,7 +18637,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_freon"
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -19465,7 +18683,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_freon-payloads",
+        "name": "daisy-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -19502,7 +18720,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_freon-release": {
+    "daisy-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -19514,7 +18732,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy_freon"
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -19532,7 +18750,7 @@
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
-        "critical_for_chrome": false,
+        "critical_for_chrome": true,
         "debug_symbols": true,
         "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": true,
@@ -19567,7 +18785,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_freon-release",
+        "name": "daisy-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -19608,7 +18826,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_freon-release-afdo": {
+    "daisy-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -19620,7 +18838,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy_freon"
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -19640,7 +18858,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "daisy_freon"
+                    "daisy"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -19695,7 +18913,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "daisy_freon-release-afdo-generate",
+                "name": "daisy-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -19748,7 +18966,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "daisy_freon"
+                    "daisy"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -19803,7 +19021,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "daisy_freon-release-afdo-use",
+                "name": "daisy-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -19892,7 +19110,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_freon-release-afdo",
+        "name": "daisy-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -19933,7 +19151,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_freon-release-afdo-generate": {
+    "daisy-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -19945,7 +19163,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy_freon"
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -20000,7 +19218,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_freon-release-afdo-generate",
+        "name": "daisy-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -20041,7 +19259,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_freon-release-afdo-use": {
+    "daisy-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -20053,7 +19271,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy_freon"
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -20108,7 +19326,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_freon-release-afdo-use",
+        "name": "daisy-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -20149,29 +19367,348 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_freon-tot-chrome-pfq-informational": {
+    "daisy-release-group": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy_freon"
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
-        "child_configs": [],
+        "build_type": "canary",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "daisy"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": true,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "daisy-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "daisy_spring"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "daisy_spring-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "daisy_skate"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "daisy_skate-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -20179,10 +19716,10 @@
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
-        "critical_for_chrome": false,
+        "critical_for_chrome": true,
         "debug_symbols": true,
-        "description": "Informational Chrome Uprev & Build (internal)",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal); Group config (boards: daisy, daisy_spring, daisy_skate)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -20194,24 +19731,31 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "daisy_freon-tot-chrome-pfq-informational",
+        "name": "daisy-release-group",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -20219,34 +19763,36 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_freon-tot-chromium-pfq-informational": {
+    "daisy-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -20258,7 +19804,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_freon"
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -20304,7 +19850,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "daisy_freon-tot-chromium-pfq-informational",
+        "name": "daisy-tot-chrome-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -20341,7 +19887,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_skate-chrome-pfq": {
+    "daisy-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -20353,7 +19899,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_skate"
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -20362,18 +19908,18 @@
         "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Informational Chromium Uprev & Build (public)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -20393,14 +19939,14 @@
             "test"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "daisy_skate-chrome-pfq",
-        "overlays": "both",
+        "name": "daisy-tot-chromium-pfq-informational",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -20409,7 +19955,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -20428,17 +19974,15 @@
         "upload_symbols": false,
         "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_skate-chromium-pfq": {
+    "daisy-webrtc-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -20450,7 +19994,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_skate"
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -20459,18 +20003,18 @@
         "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Informational Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -20494,9 +20038,9 @@
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_version": false,
         "master": false,
-        "name": "daisy_skate-chromium-pfq",
+        "name": "daisy-webrtc-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -20506,7 +20050,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -20525,53 +20069,55 @@
         "upload_symbols": false,
         "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_skate-firmware": {
+    "daisy-webrtc-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_skate"
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
+        "build_tests": true,
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "tot",
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Canary",
+        "description": "Informational Chromium Uprev & Build (public)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -20579,21 +20125,21 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": true,
+        "hwqual": false,
         "image_test": false,
-        "images": [],
+        "images": [
+            "test"
+        ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "daisy_skate-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "name": "daisy-webrtc-chromium-pfq-informational",
+        "overlays": "public",
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -20603,36 +20149,224 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
+        "sync_chrome": null,
         "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "daisy_freon-chrome-pfq": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "daisy_freon"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Preflight Chrome Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "daisy_freon-chrome-pfq",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
+            "chrome_internal"
         ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_skate-full": {
+    "daisy_freon-chromium-pfq": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "daisy_freon"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Preflight Chromium Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "daisy_freon-chromium-pfq",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "daisy_freon-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -20644,7 +20378,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_skate"
+            "daisy_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -20692,7 +20426,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "daisy_skate-full",
+        "name": "daisy_freon-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -20729,7 +20463,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_skate-payloads": {
+    "daisy_freon-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -20741,7 +20475,104 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_skate"
+            "daisy_freon"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "paladin",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Commit Queue (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "daisy_freon-paladin",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": "daisy_freon paladin",
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "daisy_freon-payloads": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "daisy_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -20787,7 +20618,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_skate-payloads",
+        "name": "daisy_freon-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -20824,7 +20655,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_skate-release": {
+    "daisy_freon-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -20836,7 +20667,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy_skate"
+            "daisy_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -20889,7 +20720,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_skate-release",
+        "name": "daisy_freon-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -20930,7 +20761,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_skate-release-afdo": {
+    "daisy_freon-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -20942,7 +20773,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy_skate"
+            "daisy_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -20962,7 +20793,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "daisy_skate"
+                    "daisy_freon"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -21017,7 +20848,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "daisy_skate-release-afdo-generate",
+                "name": "daisy_freon-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -21070,7 +20901,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "daisy_skate"
+                    "daisy_freon"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -21125,7 +20956,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "daisy_skate-release-afdo-use",
+                "name": "daisy_freon-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -21214,7 +21045,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_skate-release-afdo",
+        "name": "daisy_freon-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -21255,7 +21086,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_skate-release-afdo-generate": {
+    "daisy_freon-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -21267,7 +21098,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy_skate"
+            "daisy_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -21322,7 +21153,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_skate-release-afdo-generate",
+        "name": "daisy_freon-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -21363,7 +21194,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_skate-release-afdo-use": {
+    "daisy_freon-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -21375,7 +21206,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy_skate"
+            "daisy_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -21430,7 +21261,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_skate-release-afdo-use",
+        "name": "daisy_freon-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -21471,7 +21302,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_skate-tot-chrome-pfq-informational": {
+    "daisy_freon-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -21483,7 +21314,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_skate"
+            "daisy_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -21529,7 +21360,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "daisy_skate-tot-chrome-pfq-informational",
+        "name": "daisy_freon-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -21568,7 +21399,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_skate-tot-chromium-pfq-informational": {
+    "daisy_freon-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -21580,7 +21411,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_skate"
+            "daisy_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -21626,7 +21457,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "daisy_skate-tot-chromium-pfq-informational",
+        "name": "daisy_freon-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -21663,7 +21494,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_spring-chrome-pfq": {
+    "daisy_skate-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -21675,7 +21506,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_spring"
+            "daisy_skate"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -21708,23 +21539,20 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"pfq\",\n    \"priority\": \"PFQ\",\n    \"retry\": false,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"pfq\",\n    \"priority\": \"PFQ\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": false,
         "image_test": false,
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_spring-chrome-pfq",
+        "name": "daisy_skate-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -21763,7 +21591,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_spring-chromium-pfq": {
+    "daisy_skate-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -21775,7 +21603,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_spring"
+            "daisy_skate"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -21821,7 +21649,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_spring-chromium-pfq",
+        "name": "daisy_skate-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -21858,7 +21686,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_spring-firmware": {
+    "daisy_skate-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -21870,7 +21698,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy_spring"
+            "daisy_skate"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -21914,7 +21742,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_spring-firmware",
+        "name": "daisy_skate-firmware",
         "overlays": "both",
         "packages": [
             "virtual/chromeos-firmware"
@@ -21957,7 +21785,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_spring-full": {
+    "daisy_skate-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -21969,7 +21797,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_spring"
+            "daisy_skate"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -22017,7 +21845,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "daisy_spring-full",
+        "name": "daisy_skate-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -22054,107 +21882,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_spring-paladin": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "daisy_spring"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "paladin",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Commit Queue (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": true,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "daisy_spring-paladin",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": "daisy_spring paladin",
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "private",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "daisy_spring-payloads": {
+    "daisy_skate-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -22166,7 +21894,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_spring"
+            "daisy_skate"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -22212,7 +21940,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_spring-payloads",
+        "name": "daisy_skate-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -22249,104 +21977,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_spring-pre-cq": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": false,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "daisy_spring"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": true,
-        "build_tests": true,
-        "build_type": "binary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": false,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": false,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": false,
-        "description": "Verifies compilation, vm/unit tests, and building an image",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": true,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "daisy_spring-pre-cq",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": true,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "daisy_spring-release": {
+    "daisy_skate-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -22358,7 +21989,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy_spring"
+            "daisy_skate"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -22411,7 +22042,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_spring-release",
+        "name": "daisy_skate-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -22452,7 +22083,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_spring-release-afdo": {
+    "daisy_skate-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -22464,7 +22095,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy_spring"
+            "daisy_skate"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -22484,7 +22115,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "daisy_spring"
+                    "daisy_skate"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -22539,7 +22170,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "daisy_spring-release-afdo-generate",
+                "name": "daisy_skate-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -22592,7 +22223,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "daisy_spring"
+                    "daisy_skate"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -22647,7 +22278,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "daisy_spring-release-afdo-use",
+                "name": "daisy_skate-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -22736,7 +22367,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_spring-release-afdo",
+        "name": "daisy_skate-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -22777,7 +22408,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_spring-release-afdo-generate": {
+    "daisy_skate-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -22789,7 +22420,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy_spring"
+            "daisy_skate"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -22844,7 +22475,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_spring-release-afdo-generate",
+        "name": "daisy_skate-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -22885,7 +22516,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_spring-release-afdo-use": {
+    "daisy_skate-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -22897,7 +22528,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "daisy_spring"
+            "daisy_skate"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -22952,7 +22583,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "daisy_spring-release-afdo-use",
+        "name": "daisy_skate-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -22993,7 +22624,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_spring-tot-chrome-pfq-informational": {
+    "daisy_skate-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -23005,7 +22636,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_spring"
+            "daisy_skate"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -23051,7 +22682,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "daisy_spring-tot-chrome-pfq-informational",
+        "name": "daisy_skate-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -23090,7 +22721,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "daisy_spring-tot-chromium-pfq-informational": {
+    "daisy_skate-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -23102,7 +22733,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "daisy_spring"
+            "daisy_skate"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -23148,7 +22779,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "daisy_spring-tot-chromium-pfq-informational",
+        "name": "daisy_skate-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -23185,7 +22816,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "duck-paladin": {
+    "daisy_spring-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -23197,27 +22828,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "duck"
+            "daisy_spring"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue (internal)",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -23230,7 +22861,10 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"pfq\",\n    \"priority\": \"PFQ\",\n    \"retry\": false,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"pfq\",\n    \"priority\": \"PFQ\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": false,
         "image_test": false,
         "images": [
@@ -23239,14 +22873,14 @@
         "important": true,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "duck-paladin",
+        "name": "daisy_spring-chrome-pfq",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "duck paladin",
+        "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -23262,15 +22896,15 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": true,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -23282,7 +22916,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "duck-payloads": {
+    "daisy_spring-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -23294,27 +22928,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "duck"
+            "daisy_spring"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "payloads",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": false,
+        "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Regenerate release payloads.",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -23340,17 +22974,17 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "duck-payloads",
+        "name": "daisy_spring-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -23360,14 +22994,14 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": false,
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -23377,45 +23011,45 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "duck-pre-cq": {
+    "daisy_spring-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
-        "archive": false,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "duck"
+            "daisy_spring"
         ],
         "branch": false,
         "build_before_patching": false,
-        "build_packages_in_background": true,
-        "build_tests": true,
-        "build_type": "binary",
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": false,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
-        "cpe_export": false,
+        "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
-        "debug_symbols": false,
-        "description": "Verifies compilation, vm/unit tests, and building an image",
+        "debug_symbols": true,
+        "description": "Firmware Canary",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -23423,31 +23057,31 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": false,
+        "hwqual": true,
         "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": true,
+        "images": [],
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "duck-pre-cq",
+        "name": "daisy_spring-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
-        "pre_cq": true,
+        "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
@@ -23455,58 +23089,60 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "duck-release": {
+    "daisy_spring-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "duck"
+            "daisy_spring"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -23514,68 +23150,64 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": true,
+        "hwqual": false,
         "image_test": true,
         "images": [
             "base",
             "test",
             "factory_install"
         ],
-        "important": true,
-        "internal": true,
+        "important": false,
+        "internal": false,
         "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "duck-release",
-        "overlays": "both",
+        "name": "daisy_spring-full",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": true,
+        "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
+        "sync_chrome": null,
+        "tests_supported": false,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
+        "useflags": [],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "enguarde-chrome-pfq": {
+    "daisy_spring-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -23587,27 +23219,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "enguarde"
+            "daisy_spring"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Commit Queue (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -23620,23 +23252,26 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": false,
         "image_test": false,
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "enguarde-chrome-pfq",
+        "name": "daisy_spring-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": null,
+        "paladin_builder_name": "daisy_spring paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -23653,14 +23288,14 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
+        "tests_supported": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -23670,11 +23305,9 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "enguarde-chromium-pfq": {
+    "daisy_spring-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -23686,27 +23319,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "enguarde"
+            "daisy_spring"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": true,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -23732,17 +23365,17 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "enguarde-chromium-pfq",
+        "name": "daisy_spring-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -23756,10 +23389,10 @@
         "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -23767,49 +23400,47 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "enguarde-depthcharge-firmware": {
+    "daisy_spring-pre-cq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive": false,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "enguarde"
+            "daisy_spring"
         ],
         "branch": false,
         "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
+        "build_packages_in_background": true,
+        "build_tests": true,
+        "build_type": "binary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
+        "compilecheck": true,
+        "cpe_export": false,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Canary",
+        "debug_symbols": false,
+        "description": "Verifies compilation only",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -23817,120 +23448,127 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": true,
+        "hwqual": false,
         "image_test": false,
-        "images": [],
-        "important": false,
+        "images": [
+            "test"
+        ],
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "enguarde-depthcharge-firmware",
+        "name": "daisy_spring-pre-cq",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
-        "pre_cq": false,
+        "pre_cq": true,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "depthcharge"
+            "chrome_internal"
         ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "enguarde-depthcharge-full-firmware": {
+    "daisy_spring-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "enguarde"
+            "daisy_spring"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "full",
+        "build_tests": true,
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Informational",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "enguarde-depthcharge-full-firmware",
+        "name": "daisy_spring-release",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -23938,37 +23576,39 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "depthcharge"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "enguarde-firmware": {
+    "daisy_spring-release-afdo": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
@@ -23977,17 +23617,234 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "enguarde"
+            "daisy_spring"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
+        "build_tests": true,
         "build_type": "canary",
-        "child_configs": [],
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": true,
+                "afdo_update_ebuild": true,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "daisy_spring"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "daisy_spring-release-afdo-generate",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "daisy_spring"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "daisy_spring-release-afdo-use",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -23997,35 +23854,44 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Canary",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": true,
-        "image_test": false,
-        "images": [],
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "enguarde-firmware",
+        "name": "daisy_spring-release-afdo",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -24035,21 +23901,21 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
@@ -24059,44 +23925,44 @@
             "-cros-debug",
             "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "enguarde-full": {
+    "daisy_spring-release-afdo-generate": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "enguarde"
+            "daisy_spring"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -24104,13 +23970,20 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
         "image_test": true,
         "images": [
             "base",
@@ -24118,14 +23991,14 @@
             "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "enguarde-full",
-        "overlays": "public",
+        "name": "daisy_spring-release-afdo-generate",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -24134,7 +24007,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -24142,60 +24015,62 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "enguarde-paladin": {
+    "daisy_spring-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "enguarde"
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "daisy_spring"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue (internal)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -24208,11 +24083,20 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
@@ -24221,17 +24105,17 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "enguarde-paladin",
+        "name": "daisy_spring-release-afdo-use",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "enguarde paladin",
+        "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -24239,28 +24123,30 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
-        "upload_symbols": false,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "enguarde-payloads": {
+    "daisy_spring-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -24272,27 +24158,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "enguarde"
+            "daisy_spring"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "payloads",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "tot",
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Regenerate release payloads.",
+        "description": "Informational Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -24316,13 +24202,13 @@
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_version": false,
         "master": false,
-        "name": "enguarde-payloads",
+        "name": "daisy_spring-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -24338,57 +24224,59 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": false,
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "enguarde-release": {
+    "daisy_spring-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "enguarde"
+            "daisy_spring"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
+        "description": "Informational Chromium Uprev & Build (public)",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -24400,31 +24288,24 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "enguarde-release",
-        "overlays": "both",
+        "name": "daisy_spring-tot-chromium-pfq-informational",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -24432,297 +24313,64 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "enguarde-release-afdo": {
+    "duck-paladin": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "enguarde"
+            "duck"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": true,
-                "afdo_update_ebuild": true,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "enguarde"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "enguarde-release-afdo-generate",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": false,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "enguarde"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "enguarde-release-afdo-use",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": false,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
-            }
-        ],
+        "build_type": "paladin",
+        "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Commit Queue (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -24735,39 +24383,30 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "enguarde-release-afdo",
+        "name": "duck-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": null,
+        "paladin_builder_name": "duck paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -24775,66 +24414,60 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
+        "signer_tests": false,
+        "sync_chrome": false,
         "tests_supported": true,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
+            "chrome_internal"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "enguarde-release-afdo-generate": {
+    "duck-payloads": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "enguarde"
+            "duck"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
+        "chromeos_official": false,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -24847,145 +24480,24 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "enguarde-release-afdo-generate",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
-    },
-    "enguarde-release-afdo-use": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": true,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "enguarde"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "enguarde-release-afdo-use",
+        "name": "duck-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -24999,66 +24511,58 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "enguarde-tot-chrome-pfq-informational": {
+    "duck-pre-cq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
-        "archive": true,
+        "archive": false,
         "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "enguarde"
+            "duck"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "binary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
+        "chrome_rev": null,
         "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
+        "compilecheck": true,
+        "cpe_export": false,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Informational Chrome Uprev & Build (internal)",
+        "debug_symbols": false,
+        "description": "Verifies compilation only",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -25077,14 +24581,14 @@
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "enguarde-tot-chrome-pfq-informational",
+        "name": "duck-pre-cq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -25093,7 +24597,7 @@
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
-        "pre_cq": false,
+        "pre_cq": true,
         "prebuilts": false,
         "profile": null,
         "push_image": false,
@@ -25103,17 +24607,17 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
+        "sync_chrome": false,
         "tests_supported": true,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
             "chrome_internal"
@@ -25121,43 +24625,41 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "enguarde-tot-chromium-pfq-informational": {
+    "duck-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "enguarde"
+            "duck"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
+        "chrome_rev": null,
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -25171,58 +24673,62 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
-        "important": false,
-        "internal": false,
+        "important": true,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "enguarde-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "name": "duck-release",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
+        "paygen_skip_testing": true,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
+        "sync_chrome": false,
         "tests_supported": true,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "expresso-chrome-pfq": {
+    "enguarde-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -25234,7 +24740,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "expresso"
+            "enguarde"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -25280,7 +24786,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "expresso-chrome-pfq",
+        "name": "enguarde-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -25321,7 +24827,7 @@
             "pfq_suite"
         ]
     },
-    "expresso-chromium-pfq": {
+    "enguarde-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -25333,7 +24839,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "expresso"
+            "enguarde"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -25379,7 +24885,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "expresso-chromium-pfq",
+        "name": "enguarde-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -25418,7 +24924,7 @@
             "pfq_suite"
         ]
     },
-    "expresso-depthcharge-firmware": {
+    "enguarde-depthcharge-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -25430,7 +24936,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "expresso"
+            "enguarde"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -25474,7 +24980,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "expresso-depthcharge-firmware",
+        "name": "enguarde-depthcharge-firmware",
         "overlays": "both",
         "packages": [
             "virtual/chromeos-firmware"
@@ -25515,7 +25021,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "expresso-depthcharge-full-firmware": {
+    "enguarde-depthcharge-full-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -25527,7 +25033,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "expresso"
+            "enguarde"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -25571,7 +25077,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "expresso-depthcharge-full-firmware",
+        "name": "enguarde-depthcharge-full-firmware",
         "overlays": "both",
         "packages": [
             "virtual/chromeos-firmware"
@@ -25612,7 +25118,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "expresso-firmware": {
+    "enguarde-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -25624,7 +25130,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "expresso"
+            "enguarde"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -25668,7 +25174,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "expresso-firmware",
+        "name": "enguarde-firmware",
         "overlays": "both",
         "packages": [
             "virtual/chromeos-firmware"
@@ -25711,7 +25217,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "expresso-full": {
+    "enguarde-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -25723,7 +25229,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "expresso"
+            "enguarde"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -25771,7 +25277,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "expresso-full",
+        "name": "enguarde-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -25810,7 +25316,7 @@
             "pfq_suite"
         ]
     },
-    "expresso-paladin": {
+    "enguarde-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -25822,7 +25328,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "expresso"
+            "enguarde"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -25868,10 +25374,10 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "expresso-paladin",
+        "name": "enguarde-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "expresso paladin",
+        "paladin_builder_name": "enguarde paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -25907,7 +25413,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "expresso-payloads": {
+    "enguarde-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -25919,7 +25425,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "expresso"
+            "enguarde"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -25965,7 +25471,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "expresso-payloads",
+        "name": "enguarde-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -26002,7 +25508,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "expresso-release": {
+    "enguarde-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -26014,7 +25520,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "expresso"
+            "enguarde"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -26067,7 +25573,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "expresso-release",
+        "name": "enguarde-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -26112,7 +25618,7 @@
             "cros_vm_test"
         ]
     },
-    "expresso-release-afdo": {
+    "enguarde-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -26124,7 +25630,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "expresso"
+            "enguarde"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -26144,7 +25650,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "expresso"
+                    "enguarde"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -26199,7 +25705,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "expresso-release-afdo-generate",
+                "name": "enguarde-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -26256,7 +25762,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "expresso"
+                    "enguarde"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -26311,7 +25817,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "expresso-release-afdo-use",
+                "name": "enguarde-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -26404,7 +25910,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "expresso-release-afdo",
+        "name": "enguarde-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -26449,7 +25955,7 @@
             "cros_vm_test"
         ]
     },
-    "expresso-release-afdo-generate": {
+    "enguarde-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -26461,7 +25967,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "expresso"
+            "enguarde"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -26516,7 +26022,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "expresso-release-afdo-generate",
+        "name": "enguarde-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -26561,7 +26067,7 @@
             "cros_vm_test"
         ]
     },
-    "expresso-release-afdo-use": {
+    "enguarde-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -26573,7 +26079,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "expresso"
+            "enguarde"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -26628,7 +26134,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "expresso-release-afdo-use",
+        "name": "enguarde-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -26673,7 +26179,7 @@
             "cros_vm_test"
         ]
     },
-    "expresso-tot-chrome-pfq-informational": {
+    "enguarde-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -26685,7 +26191,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "expresso"
+            "enguarde"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -26731,7 +26237,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "expresso-tot-chrome-pfq-informational",
+        "name": "enguarde-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -26772,7 +26278,7 @@
             "smoke_suite"
         ]
     },
-    "expresso-tot-chromium-pfq-informational": {
+    "enguarde-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -26784,7 +26290,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "expresso"
+            "enguarde"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -26830,7 +26336,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "expresso-tot-chromium-pfq-informational",
+        "name": "enguarde-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -26869,7 +26375,7 @@
             "smoke_suite"
         ]
     },
-    "falco-chrome-pfq": {
+    "expresso-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -26881,7 +26387,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "falco"
+            "expresso"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -26914,23 +26420,20 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"pfq\",\n    \"priority\": \"PFQ\",\n    \"retry\": false,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"pfq\",\n    \"priority\": \"PFQ\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": false,
         "image_test": false,
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco-chrome-pfq",
+        "name": "expresso-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -26971,7 +26474,7 @@
             "pfq_suite"
         ]
     },
-    "falco-chromium-pfq": {
+    "expresso-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -26983,7 +26486,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "falco"
+            "expresso"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -27029,7 +26532,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco-chromium-pfq",
+        "name": "expresso-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -27068,7 +26571,7 @@
             "pfq_suite"
         ]
     },
-    "falco-firmware": {
+    "expresso-depthcharge-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -27080,7 +26583,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "falco"
+            "expresso"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -27124,7 +26627,201 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco-firmware",
+        "name": "expresso-depthcharge-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "depthcharge"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "expresso-depthcharge-full-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "expresso"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "full",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Informational",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": false,
+        "master": false,
+        "name": "expresso-depthcharge-full-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "depthcharge"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "expresso-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "expresso"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "expresso-firmware",
         "overlays": "both",
         "packages": [
             "virtual/chromeos-firmware"
@@ -27167,7 +26864,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "falco-full": {
+    "expresso-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -27179,7 +26876,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "falco"
+            "expresso"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -27227,7 +26924,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "falco-full",
+        "name": "expresso-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -27266,7 +26963,7 @@
             "pfq_suite"
         ]
     },
-    "falco-paladin": {
+    "expresso-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -27276,9 +26973,9 @@
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
-        "board_replace": true,
+        "board_replace": false,
         "boards": [
-            "falco"
+            "expresso"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -27286,7 +26983,7 @@
         "build_tests": true,
         "build_type": "paladin",
         "child_configs": [],
-        "chrome_binhost_only": true,
+        "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": false,
@@ -27317,17 +27014,17 @@
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco-paladin",
+        "name": "expresso-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "falco paladin",
+        "paladin_builder_name": "expresso paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -27363,7 +27060,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "falco-payloads": {
+    "expresso-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -27375,7 +27072,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "falco"
+            "expresso"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -27421,7 +27118,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco-payloads",
+        "name": "expresso-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -27458,7 +27155,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "falco-release": {
+    "expresso-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -27470,7 +27167,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "falco"
+            "expresso"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -27523,7 +27220,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco-release",
+        "name": "expresso-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -27568,7 +27265,7 @@
             "cros_vm_test"
         ]
     },
-    "falco-release-afdo": {
+    "expresso-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -27580,7 +27277,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "falco"
+            "expresso"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -27600,7 +27297,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "falco"
+                    "expresso"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -27655,7 +27352,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "falco-release-afdo-generate",
+                "name": "expresso-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -27712,7 +27409,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "falco"
+                    "expresso"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -27767,7 +27464,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "falco-release-afdo-use",
+                "name": "expresso-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -27860,7 +27557,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco-release-afdo",
+        "name": "expresso-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -27905,7 +27602,7 @@
             "cros_vm_test"
         ]
     },
-    "falco-release-afdo-generate": {
+    "expresso-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -27917,7 +27614,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "falco"
+            "expresso"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -27972,7 +27669,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco-release-afdo-generate",
+        "name": "expresso-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -28017,7 +27714,7 @@
             "cros_vm_test"
         ]
     },
-    "falco-release-afdo-use": {
+    "expresso-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -28029,7 +27726,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "falco"
+            "expresso"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -28084,7 +27781,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco-release-afdo-use",
+        "name": "expresso-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -28129,7 +27826,7 @@
             "cros_vm_test"
         ]
     },
-    "falco-tot-chrome-pfq-informational": {
+    "expresso-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -28141,7 +27838,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "falco"
+            "expresso"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -28187,7 +27884,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "falco-tot-chrome-pfq-informational",
+        "name": "expresso-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -28228,7 +27925,7 @@
             "smoke_suite"
         ]
     },
-    "falco-tot-chromium-pfq-informational": {
+    "expresso-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -28240,7 +27937,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "falco"
+            "expresso"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -28286,7 +27983,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "falco-tot-chromium-pfq-informational",
+        "name": "expresso-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -28325,7 +28022,7 @@
             "smoke_suite"
         ]
     },
-    "falco_li-chrome-pfq": {
+    "falco-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -28337,7 +28034,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "falco_li"
+            "falco"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -28370,20 +28067,23 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"pfq\",\n    \"priority\": \"PFQ\",\n    \"retry\": false,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"pfq\",\n    \"priority\": \"PFQ\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": false,
         "image_test": false,
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco_li-chrome-pfq",
+        "name": "falco-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -28424,7 +28124,7 @@
             "pfq_suite"
         ]
     },
-    "falco_li-chromium-pfq": {
+    "falco-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -28436,7 +28136,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "falco_li"
+            "falco"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -28482,7 +28182,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco_li-chromium-pfq",
+        "name": "falco-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -28521,7 +28221,106 @@
             "pfq_suite"
         ]
     },
-    "falco_li-full": {
+    "falco-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "falco"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "falco-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "falco-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -28533,7 +28332,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "falco_li"
+            "falco"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -28581,7 +28380,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "falco_li-full",
+        "name": "falco-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -28620,7 +28419,104 @@
             "pfq_suite"
         ]
     },
-    "falco_li-payloads": {
+    "falco-paladin": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": true,
+        "boards": [
+            "falco"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "paladin",
+        "child_configs": [],
+        "chrome_binhost_only": true,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Commit Queue (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": true,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "falco-paladin",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": "falco paladin",
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "falco-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -28632,7 +28528,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "falco_li"
+            "falco"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -28678,7 +28574,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco_li-payloads",
+        "name": "falco-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -28715,7 +28611,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "falco_li-release": {
+    "falco-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -28727,7 +28623,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "falco_li"
+            "falco"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -28780,7 +28676,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco_li-release",
+        "name": "falco-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -28825,7 +28721,7 @@
             "cros_vm_test"
         ]
     },
-    "falco_li-release-afdo": {
+    "falco-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -28837,7 +28733,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "falco_li"
+            "falco"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -28857,7 +28753,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "falco_li"
+                    "falco"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -28912,7 +28808,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "falco_li-release-afdo-generate",
+                "name": "falco-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -28969,7 +28865,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "falco_li"
+                    "falco"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -29024,7 +28920,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "falco_li-release-afdo-use",
+                "name": "falco-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -29117,7 +29013,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco_li-release-afdo",
+        "name": "falco-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -29162,7 +29058,7 @@
             "cros_vm_test"
         ]
     },
-    "falco_li-release-afdo-generate": {
+    "falco-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -29174,7 +29070,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "falco_li"
+            "falco"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -29229,7 +29125,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco_li-release-afdo-generate",
+        "name": "falco-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -29274,7 +29170,7 @@
             "cros_vm_test"
         ]
     },
-    "falco_li-release-afdo-use": {
+    "falco-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -29286,7 +29182,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "falco_li"
+            "falco"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -29341,7 +29237,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "falco_li-release-afdo-use",
+        "name": "falco-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -29386,7 +29282,7 @@
             "cros_vm_test"
         ]
     },
-    "falco_li-tot-chrome-pfq-informational": {
+    "falco-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -29398,7 +29294,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "falco_li"
+            "falco"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -29444,7 +29340,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "falco_li-tot-chrome-pfq-informational",
+        "name": "falco-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -29485,7 +29381,7 @@
             "smoke_suite"
         ]
     },
-    "falco_li-tot-chromium-pfq-informational": {
+    "falco-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -29497,7 +29393,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "falco_li"
+            "falco"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -29543,7 +29439,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "falco_li-tot-chromium-pfq-informational",
+        "name": "falco-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -29582,7 +29478,7 @@
             "smoke_suite"
         ]
     },
-    "fox_wtm2-paladin": {
+    "falco_li-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -29594,27 +29490,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "fox_wtm2"
+            "falco_li"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue (internal)",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -29636,14 +29532,14 @@
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "fox_wtm2-paladin",
+        "name": "falco_li-chrome-pfq",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "fox_wtm2 paladin",
+        "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -29661,13 +29557,13 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -29677,205 +29573,11 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "fox_wtm2-payloads": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "fox_wtm2"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "payloads",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Regenerate release payloads.",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "fox_wtm2-payloads",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "fox_wtm2-release": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": true,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "fox_wtm2"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "fox_wtm2-release",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "gizmo-chromium-pfq": {
+    "falco_li-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -29887,7 +29589,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "gizmo"
+            "falco_li"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -29933,7 +29635,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "gizmo-chromium-pfq",
+        "name": "falco_li-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -29972,7 +29674,7 @@
             "pfq_suite"
         ]
     },
-    "gizmo-full": {
+    "falco_li-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -29984,17 +29686,17 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "gizmo"
+            "falco_li"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
+        "build_tests": true,
         "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -30010,7 +29712,7 @@
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": true,
         "grouped": false,
@@ -30022,7 +29724,8 @@
         "image_test": true,
         "images": [
             "base",
-            "dev"
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": false,
@@ -30031,21 +29734,17 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "gizmo-full",
+        "name": "falco_li-full",
         "overlays": "public",
-        "packages": [
-            "virtual/target-os",
-            "virtual/target-os-dev",
-            "chromeos-base/chromeos-initramfs"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": true,
+        "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -30054,11 +29753,11 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": false,
+        "sync_chrome": null,
+        "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -30070,9 +29769,11 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "gizmo-paladin": {
+    "falco_li-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -30084,27 +29785,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "gizmo"
+            "falco_li"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": false,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": true,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -30124,23 +29825,23 @@
             "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "gizmo-paladin",
-        "overlays": "public",
+        "name": "falco_li-payloads",
+        "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "gizmo paladin",
-        "paygen": false,
+        "paladin_builder_name": null,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -30149,13 +29850,13 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
+        "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
@@ -30167,11 +29868,11 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "gizmo-release": {
+    "falco_li-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -30179,7 +29880,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "gizmo"
+            "falco_li"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -30189,7 +29890,7 @@
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -30200,7 +29901,7 @@
         "critical_for_chrome": false,
         "debug_symbols": true,
         "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": false,
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -30212,7 +29913,12 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": true,
         "image_test": true,
         "images": [
@@ -30227,11 +29933,11 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "gizmo-release",
+        "name": "falco_li-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -30245,8 +29951,8 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
+        "signer_tests": true,
+        "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
@@ -30266,41 +29972,270 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "gizmo-tot-chromium-pfq-informational": {
+    "falco_li-release-afdo": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "gizmo"
+            "falco_li"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
-        "child_configs": [],
+        "build_type": "canary",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": true,
+                "afdo_update_ebuild": true,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "falco_li"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "falco_li-release-afdo-generate",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "falco_li"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "falco_li-release-afdo-use",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
+            }
+        ],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -30313,21 +30248,30 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "gizmo-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "name": "falco_li-release-afdo",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -30344,7 +30288,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
@@ -30352,41 +30296,47 @@
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": [
-            "smoke_suite"
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
         ]
     },
-    "glimmer-chrome-pfq": {
+    "falco_li-release-afdo-generate": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "glimmer"
+            "falco_li"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -30397,7 +30347,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -30410,20 +30360,29 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "glimmer-chrome-pfq",
+        "name": "falco_li-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -30433,7 +30392,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -30441,7 +30400,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
@@ -30449,54 +30408,58 @@
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": [
-            "pfq_suite"
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
         ]
     },
-    "glimmer-chromium-pfq": {
+    "falco_li-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "glimmer"
+            "falco_li"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -30509,20 +30472,29 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "glimmer-chromium-pfq",
+        "name": "falco_li-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -30532,7 +30504,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -30540,7 +30512,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
@@ -30548,41 +30520,47 @@
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": [
-            "pfq_suite"
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
         ]
     },
-    "glimmer-depthcharge-firmware": {
+    "falco_li-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "glimmer"
+            "falco_li"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
+        "build_tests": true,
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "tot",
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -30593,13 +30571,13 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Canary",
+        "description": "Informational Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -30607,21 +30585,21 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": true,
+        "hwqual": false,
         "image_test": false,
-        "images": [],
+        "images": [
+            "test"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_version": false,
         "master": false,
-        "name": "glimmer-depthcharge-firmware",
+        "name": "falco_li-tot-chrome-pfq-informational",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -30631,55 +30609,57 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
+        "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
         "useflags": [
-            "depthcharge"
+            "chrome_internal"
         ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite"
+        ]
     },
-    "glimmer-depthcharge-full-firmware": {
+    "falco_li-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "glimmer"
+            "falco_li"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "full",
+        "build_tests": true,
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "tot",
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -30690,15 +30670,15 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Informational",
+        "description": "Informational Chromium Uprev & Build (public)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
@@ -30706,19 +30686,19 @@
         "hw_tests": [],
         "hwqual": false,
         "image_test": false,
-        "images": [],
+        "images": [
+            "test"
+        ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "glimmer-depthcharge-full-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "name": "falco_li-tot-chromium-pfq-informational",
+        "overlays": "public",
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -30735,65 +30715,162 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
+        "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": true,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite"
+        ]
+    },
+    "fox_wtm2-paladin": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "fox_wtm2"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "paladin",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Commit Queue (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "fox_wtm2-paladin",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": "fox_wtm2 paladin",
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "depthcharge"
+            "chrome_internal"
         ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "glimmer-firmware": {
+    "fox_wtm2-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "glimmer"
+            "fox_wtm2"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
+        "build_tests": true,
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
+        "chromeos_official": false,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Canary",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -30801,9 +30878,11 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": true,
+        "hwqual": false,
         "image_test": false,
-        "images": [],
+        "images": [
+            "test"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
@@ -30811,13 +30890,11 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "glimmer-firmware",
+        "name": "fox_wtm2-payloads",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -30825,18 +30902,18 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
+        "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -30844,63 +30921,59 @@
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "glimmer-full": {
+    "fox_wtm2-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "glimmer"
+            "fox_wtm2"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": false,
+        "hwqual": true,
         "image_test": true,
         "images": [
             "base",
@@ -30908,25 +30981,25 @@
             "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "glimmer-full",
-        "overlays": "public",
+        "name": "fox_wtm2-release",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
@@ -30940,20 +31013,22 @@
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "glimmer-paladin": {
+    "gizmo-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -30965,18 +31040,18 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "glimmer"
+            "gizmo"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
@@ -30985,7 +31060,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue (internal)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -31007,21 +31082,21 @@
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "glimmer-paladin",
+        "name": "gizmo-chromium-pfq",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "glimmer paladin",
+        "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -31032,25 +31107,125 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "gizmo-full": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "gizmo"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "full",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Full Builds",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": true,
+        "images": [
+            "base",
+            "dev"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "gizmo-full",
+        "overlays": "public",
+        "packages": [
+            "virtual/target-os",
+            "virtual/target-os-dev",
+            "chromeos-base/chromeos-initramfs"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": true,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": false,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
         "vm_tests": []
     },
-    "glimmer-payloads": {
+    "gizmo-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -31062,27 +31237,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "glimmer"
+            "gizmo"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "payloads",
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": false,
+        "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
-        "create_delta_sysroot": false,
+        "create_delta_sysroot": true,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Regenerate release payloads.",
+        "description": "Commit Queue",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -31101,24 +31276,24 @@
         "images": [
             "test"
         ],
-        "important": false,
-        "internal": true,
+        "important": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": true,
         "master": false,
-        "name": "glimmer-payloads",
-        "overlays": "both",
+        "name": "gizmo-paladin",
+        "overlays": "public",
         "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
+        "paladin_builder_name": "gizmo paladin",
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -31127,13 +31302,13 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
+        "sync_chrome": false,
         "tests_supported": true,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": true,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
@@ -31143,13 +31318,13 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": null
     },
-    "glimmer-release": {
+    "gizmo-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -31157,7 +31332,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "glimmer"
+            "gizmo"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -31167,7 +31342,7 @@
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -31178,7 +31353,7 @@
         "critical_for_chrome": false,
         "debug_symbols": true,
         "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -31190,12 +31365,7 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": true,
         "image_test": true,
         "images": [
@@ -31210,11 +31380,11 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "glimmer-release",
+        "name": "gizmo-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -31228,8 +31398,8 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
+        "signer_tests": false,
+        "sync_chrome": false,
         "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
@@ -31249,270 +31419,41 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "glimmer-release-afdo": {
+    "gizmo-tot-chromium-pfq-informational": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "glimmer"
+            "gizmo"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": true,
-                "afdo_update_ebuild": true,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "glimmer"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "glimmer-release-afdo-generate",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": false,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "glimmer"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "glimmer-release-afdo-use",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": false,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
-            }
-        ],
+        "build_type": "chrome",
+        "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Informational Chromium Uprev & Build (public)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -31525,30 +31466,21 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "glimmer-release-afdo",
-        "overlays": "both",
+        "name": "gizmo-tot-chromium-pfq-informational",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -31565,7 +31497,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
@@ -31573,35 +31505,29 @@
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
+            "smoke_suite"
         ]
     },
-    "glimmer-release-afdo-generate": {
+    "glimmer-chrome-pfq": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
             "glimmer"
@@ -31610,10 +31536,10 @@
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -31624,7 +31550,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -31637,29 +31563,20 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "glimmer-release-afdo-generate",
+        "name": "glimmer-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -31669,7 +31586,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -31677,7 +31594,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
@@ -31685,35 +31602,31 @@
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
+            "chrome_internal"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
+            "pfq_suite"
         ]
     },
-    "glimmer-release-afdo-use": {
+    "glimmer-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
             "glimmer"
@@ -31722,21 +31635,21 @@
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -31749,29 +31662,20 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "glimmer-release-afdo-use",
+        "name": "glimmer-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -31781,7 +31685,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -31789,7 +31693,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
@@ -31797,35 +31701,29 @@
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
+            "pfq_suite"
         ]
     },
-    "glimmer-tot-chrome-pfq-informational": {
+    "glimmer-depthcharge-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
             "glimmer"
@@ -31833,11 +31731,11 @@
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
+        "build_tests": false,
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
+        "chrome_rev": null,
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -31848,13 +31746,13 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chrome Uprev & Build (internal)",
+        "description": "Firmware Canary",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -31862,21 +31760,21 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": false,
+        "hwqual": true,
         "image_test": false,
-        "images": [
-            "test"
-        ],
+        "images": [],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "glimmer-tot-chrome-pfq-informational",
+        "name": "glimmer-depthcharge-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -31886,42 +31784,40 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
+        "sync_chrome": false,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "depthcharge"
         ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "glimmer-tot-chromium-pfq-informational": {
+    "glimmer-depthcharge-full-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
@@ -31932,11 +31828,11 @@
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
+        "build_tests": false,
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
+        "chrome_rev": null,
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -31947,15 +31843,15 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Firmware Informational",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
@@ -31963,405 +31859,15 @@
         "hw_tests": [],
         "hwqual": false,
         "image_test": false,
-        "images": [
-            "test"
-        ],
+        "images": [],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "glimmer-tot-chromium-pfq-informational",
-        "overlays": "public",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
-        "use_chrome_lkgm": false,
-        "use_lkgm": true,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
-    },
-    "gnawty-chrome-pfq": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "gnawty"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "gnawty-chrome-pfq",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "private",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
-    },
-    "gnawty-chromium-pfq": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "gnawty"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "gnawty-chromium-pfq",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "public",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
-    },
-    "gnawty-depthcharge-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "gnawty"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Canary",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "gnawty-depthcharge-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "depthcharge"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "gnawty-depthcharge-full-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "gnawty"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "full",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Informational",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": true,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
-        "master": false,
-        "name": "gnawty-depthcharge-full-firmware",
+        "name": "glimmer-depthcharge-full-firmware",
         "overlays": "both",
         "packages": [
             "virtual/chromeos-firmware"
@@ -32402,7 +31908,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "gnawty-firmware": {
+    "glimmer-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -32414,7 +31920,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "gnawty"
+            "glimmer"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -32458,7 +31964,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "gnawty-firmware",
+        "name": "glimmer-firmware",
         "overlays": "both",
         "packages": [
             "virtual/chromeos-firmware"
@@ -32501,7 +32007,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "gnawty-full": {
+    "glimmer-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -32513,7 +32019,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "gnawty"
+            "glimmer"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -32561,7 +32067,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "gnawty-full",
+        "name": "glimmer-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -32600,7 +32106,7 @@
             "pfq_suite"
         ]
     },
-    "gnawty-paladin": {
+    "glimmer-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -32612,7 +32118,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "gnawty"
+            "glimmer"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -32658,10 +32164,10 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "gnawty-paladin",
+        "name": "glimmer-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "gnawty paladin",
+        "paladin_builder_name": "glimmer paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -32697,7 +32203,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "gnawty-payloads": {
+    "glimmer-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -32709,7 +32215,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "gnawty"
+            "glimmer"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -32755,7 +32261,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "gnawty-payloads",
+        "name": "glimmer-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -32792,7 +32298,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "gnawty-release": {
+    "glimmer-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -32804,7 +32310,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "gnawty"
+            "glimmer"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -32857,7 +32363,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "gnawty-release",
+        "name": "glimmer-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -32902,7 +32408,7 @@
             "cros_vm_test"
         ]
     },
-    "gnawty-release-afdo": {
+    "glimmer-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -32914,7 +32420,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "gnawty"
+            "glimmer"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -32934,7 +32440,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "gnawty"
+                    "glimmer"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -32989,7 +32495,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "gnawty-release-afdo-generate",
+                "name": "glimmer-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -33046,7 +32552,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "gnawty"
+                    "glimmer"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -33101,7 +32607,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "gnawty-release-afdo-use",
+                "name": "glimmer-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -33194,7 +32700,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "gnawty-release-afdo",
+        "name": "glimmer-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -33239,7 +32745,7 @@
             "cros_vm_test"
         ]
     },
-    "gnawty-release-afdo-generate": {
+    "glimmer-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -33251,7 +32757,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "gnawty"
+            "glimmer"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -33306,7 +32812,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "gnawty-release-afdo-generate",
+        "name": "glimmer-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -33351,7 +32857,7 @@
             "cros_vm_test"
         ]
     },
-    "gnawty-release-afdo-use": {
+    "glimmer-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -33363,7 +32869,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "gnawty"
+            "glimmer"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -33418,7 +32924,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "gnawty-release-afdo-use",
+        "name": "glimmer-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -33463,7 +32969,7 @@
             "cros_vm_test"
         ]
     },
-    "gnawty-tot-chrome-pfq-informational": {
+    "glimmer-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -33475,7 +32981,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "gnawty"
+            "glimmer"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -33521,7 +33027,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "gnawty-tot-chrome-pfq-informational",
+        "name": "glimmer-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -33562,7 +33068,7 @@
             "smoke_suite"
         ]
     },
-    "gnawty-tot-chromium-pfq-informational": {
+    "glimmer-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -33574,7 +33080,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "gnawty"
+            "glimmer"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -33620,7 +33126,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "gnawty-tot-chromium-pfq-informational",
+        "name": "glimmer-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -33659,30 +33165,28 @@
             "smoke_suite"
         ]
     },
-    "internal-toolchain-major": {
+    "gnawty-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "x86-alex",
-            "stumpy",
-            "daisy"
+            "gnawty"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chroot",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -33693,35 +33197,33 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Test next major toolchain revision (internal)",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
         "factory_toolkit": true,
-        "gcc_githash": "svn-mirror/google/gcc-4_9-mobile",
-        "git_sync": true,
+        "gcc_githash": null,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
-        "latest_toolchain": true,
+        "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "internal-toolchain-major",
+        "name": "gnawty-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -33731,7 +33233,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -33748,83 +33250,79 @@
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
-        "use_sdk": false,
+        "use_sdk": true,
         "useflags": [
             "chrome_internal"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": [
             "pfq_suite"
         ]
     },
-    "internal-toolchain-minor": {
+    "gnawty-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "x86-alex",
-            "stumpy",
-            "daisy"
+            "gnawty"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chroot",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Test next minor toolchain revision (internal)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
         "factory_toolkit": true,
-        "gcc_githash": "gcc.gnu.org/branches/google/gcc-4_8-mobile",
-        "git_sync": true,
+        "gcc_githash": null,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
-        "latest_toolchain": true,
+        "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "internal-toolchain-minor",
+        "name": "gnawty-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -33834,7 +33332,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -33851,21 +33349,116 @@
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
-        "use_sdk": false,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": [
             "pfq_suite"
         ]
     },
-    "ivybridge-full-group": {
+    "gnawty-depthcharge-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "gnawty"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "gnawty-depthcharge-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "depthcharge"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "gnawty-depthcharge-full-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -33877,214 +33470,17 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "stout"
+            "gnawty"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
+        "build_tests": false,
         "build_type": "full",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "stout"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "stout-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "pfq_suite"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "parrot_ivb"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": false,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "parrot_ivb-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -34094,13 +33490,13 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds; Group config (boards: stout, parrot_ivb)",
+        "description": "Firmware Informational",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": true,
         "grouped": false,
@@ -34109,22 +33505,20 @@
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
+        "image_test": false,
+        "images": [],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "ivybridge-full-group",
-        "overlays": "public",
-        "packages": [],
+        "name": "gnawty-depthcharge-full-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -34132,7 +33526,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -34141,31 +33535,31 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
+        "sync_chrome": false,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [
+            "depthcharge"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "ivybridge-release-group": {
+    "gnawty-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -34173,234 +33567,17 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "stout"
+            "gnawty"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
+        "build_tests": false,
         "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "stout"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "stout-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "parrot_ivb"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": false,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "parrot_ivb-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -34410,44 +33587,37 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal); Group config (boards: stout, parrot_ivb)",
-        "dev_installer_prebuilts": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "ivybridge-release-group",
+        "name": "gnawty-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -34461,15 +33631,15 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
+        "signer_tests": false,
+        "sync_chrome": false,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
@@ -34479,48 +33649,44 @@
             "-cros-debug",
             "-highdpi"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "kip-chrome-pfq": {
+    "gnawty-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "kip"
+            "gnawty"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -34528,26 +33694,28 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "kip-chrome-pfq",
-        "overlays": "both",
+        "name": "gnawty-full",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -34556,7 +33724,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -34567,27 +33735,25 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": [
             "pfq_suite"
         ]
     },
-    "kip-chromium-pfq": {
+    "gnawty-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -34599,18 +33765,18 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "kip"
+            "gnawty"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
@@ -34619,7 +33785,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Commit Queue (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -34641,21 +33807,21 @@
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "kip-chromium-pfq",
+        "name": "gnawty-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": null,
+        "paladin_builder_name": "gnawty paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -34666,140 +33832,43 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
-    },
-    "kip-depthcharge-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "kip"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Canary",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "kip-depthcharge-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "depthcharge"
+            "chrome_internal"
         ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "kip-depthcharge-full-firmware": {
+    "gnawty-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "kip"
+            "gnawty"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "full",
+        "build_tests": true,
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
@@ -34807,21 +33876,21 @@
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": true,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Informational",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
@@ -34829,21 +33898,21 @@
         "hw_tests": [],
         "hwqual": false,
         "image_test": false,
-        "images": [],
+        "images": [
+            "test"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "kip-depthcharge-full-firmware",
+        "name": "gnawty-payloads",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -34858,11 +33927,11 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
+        "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -34870,19 +33939,17 @@
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "depthcharge"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "kip-firmware": {
+    "gnawty-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -34890,17 +33957,17 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "kip"
+            "gnawty"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
+        "build_tests": true,
         "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -34910,37 +33977,44 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Canary",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": true,
-        "image_test": false,
-        "images": [],
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "kip-firmware",
+        "name": "gnawty-release",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -34954,15 +34028,15 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
+        "signer_tests": true,
+        "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
@@ -34972,416 +34046,19 @@
             "-cros-debug",
             "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "kip-full": {
+    "gnawty-release-afdo": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "kip"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "full",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Full Builds",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": true,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": false,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
-        "master": false,
-        "name": "kip-full",
-        "overlays": "public",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "public",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
-    },
-    "kip-paladin": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "kip"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "paladin",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Commit Queue (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "kip-paladin",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": "kip paladin",
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "private",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "kip-payloads": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "kip"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "payloads",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Regenerate release payloads.",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "kip-payloads",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "kip-release": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": true,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "kip"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "kip-release",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
-    },
-    "kip-release-afdo": {
-        "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
@@ -35390,7 +34067,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "kip"
+            "gnawty"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -35410,7 +34087,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "kip"
+                    "gnawty"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -35465,7 +34142,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "kip-release-afdo-generate",
+                "name": "gnawty-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -35522,7 +34199,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "kip"
+                    "gnawty"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -35577,7 +34254,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "kip-release-afdo-use",
+                "name": "gnawty-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -35670,7 +34347,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "kip-release-afdo",
+        "name": "gnawty-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -35715,7 +34392,7 @@
             "cros_vm_test"
         ]
     },
-    "kip-release-afdo-generate": {
+    "gnawty-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -35727,7 +34404,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "kip"
+            "gnawty"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -35782,7 +34459,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "kip-release-afdo-generate",
+        "name": "gnawty-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -35827,7 +34504,7 @@
             "cros_vm_test"
         ]
     },
-    "kip-release-afdo-use": {
+    "gnawty-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -35839,7 +34516,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "kip"
+            "gnawty"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -35894,7 +34571,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "kip-release-afdo-use",
+        "name": "gnawty-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -35939,7 +34616,7 @@
             "cros_vm_test"
         ]
     },
-    "kip-tot-chrome-pfq-informational": {
+    "gnawty-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -35951,7 +34628,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "kip"
+            "gnawty"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -35997,7 +34674,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "kip-tot-chrome-pfq-informational",
+        "name": "gnawty-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -36038,7 +34715,7 @@
             "smoke_suite"
         ]
     },
-    "kip-tot-chromium-pfq-informational": {
+    "gnawty-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -36050,7 +34727,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "kip"
+            "gnawty"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -36096,7 +34773,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "kip-tot-chromium-pfq-informational",
+        "name": "gnawty-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -36135,28 +34812,30 @@
             "smoke_suite"
         ]
     },
-    "lemmings-chrome-pfq": {
+    "internal-toolchain-major": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lemmings"
+            "x86-alex",
+            "stumpy",
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "chroot",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -36167,33 +34846,35 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Test next major toolchain revision (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
         "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
+        "gcc_githash": "svn-mirror/google/gcc-4_9-mobile",
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
-        "latest_toolchain": false,
+        "latest_toolchain": true,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_version": false,
         "master": false,
-        "name": "lemmings-chrome-pfq",
+        "name": "internal-toolchain-major",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -36203,7 +34884,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -36220,79 +34901,83 @@
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
-        "use_sdk": true,
+        "use_sdk": false,
         "useflags": [
             "chrome_internal"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": [
             "pfq_suite"
         ]
     },
-    "lemmings-chromium-pfq": {
+    "internal-toolchain-minor": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lemmings"
+            "x86-alex",
+            "stumpy",
+            "daisy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "chroot",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Test next minor toolchain revision (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
         "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
+        "gcc_githash": "gcc.gnu.org/branches/google/gcc-4_8-mobile",
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
-        "latest_toolchain": false,
+        "latest_toolchain": true,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_version": false,
         "master": false,
-        "name": "lemmings-chromium-pfq",
+        "name": "internal-toolchain-minor",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -36302,7 +34987,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -36319,19 +35004,21 @@
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "use_sdk": false,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": [
             "pfq_suite"
         ]
     },
-    "lemmings-full": {
+    "ivybridge-full-group": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -36343,14 +35030,211 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lemmings"
+            "stout"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
         "build_type": "full",
-        "child_configs": [],
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "stout"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "stout-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "pfq_suite"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "parrot_ivb"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": false,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "parrot_ivb-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
@@ -36363,7 +35247,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
+        "description": "Full Builds; Group config (boards: stout, parrot_ivb)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -36391,7 +35275,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "lemmings-full",
+        "name": "ivybridge-full-group",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -36430,209 +35314,11 @@
             "pfq_suite"
         ]
     },
-    "lemmings-paladin": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "lemmings"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "paladin",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": false,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Commit Queue (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "lemmings-paladin",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": "lemmings paladin",
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "private",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "lemmings-release": {
+    "ivybridge-release-group": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "lemmings"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "lemmings-release",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": true,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "lemmings-release-afdo": {
-        "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -36640,7 +35326,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "lemmings"
+            "stout"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -36650,9 +35336,9 @@
         "child_configs": [
             {
                 "afdo_generate": false,
-                "afdo_generate_min": true,
-                "afdo_update_ebuild": true,
-                "afdo_use": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
                 "archive": true,
                 "archive_build_debug": true,
                 "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -36660,7 +35346,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "lemmings"
+                    "stout"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -36681,7 +35367,7 @@
                 "critical_for_chrome": false,
                 "debug_symbols": true,
                 "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
+                "dev_installer_prebuilts": true,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
                 "do_not_apply_cq_patches": false,
@@ -36694,12 +35380,10 @@
                 "health_alert_recipients": [],
                 "health_threshold": 0,
                 "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
                 ],
                 "hwqual": true,
                 "image_test": true,
@@ -36715,11 +35399,11 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "lemmings-release-afdo-generate",
+                "name": "stout-release",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
-                "paygen": false,
+                "paygen": true,
                 "paygen_skip_delta_payloads": false,
                 "paygen_skip_testing": false,
                 "postsync_patch": true,
@@ -36727,7 +35411,7 @@
                 "pre_cq": false,
                 "prebuilts": false,
                 "profile": null,
-                "push_image": false,
+                "push_image": true,
                 "push_overlays": null,
                 "quick_unit": false,
                 "rootfs_verification": true,
@@ -36736,7 +35420,7 @@
                 "signer_tests": true,
                 "sync_chrome": null,
                 "tests_supported": true,
-                "trybot_list": false,
+                "trybot_list": true,
                 "unittest_blacklist": [],
                 "unittests": true,
                 "upload_hw_test_artifacts": true,
@@ -36772,18 +35456,18 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "lemmings"
+                    "parrot_ivb"
                 ],
                 "branch": false,
                 "build_before_patching": false,
-                "build_packages_in_background": false,
+                "build_packages_in_background": true,
                 "build_tests": true,
                 "build_type": "canary",
                 "child_configs": [],
                 "chrome_binhost_only": false,
                 "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
+                "chrome_sdk": false,
+                "chrome_sdk_build_chrome": false,
                 "chrome_sdk_goma": false,
                 "chromeos_official": true,
                 "chroot_replace": true,
@@ -36793,7 +35477,7 @@
                 "critical_for_chrome": false,
                 "debug_symbols": true,
                 "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
+                "dev_installer_prebuilts": true,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
                 "do_not_apply_cq_patches": false,
@@ -36806,12 +35490,10 @@
                 "health_alert_recipients": [],
                 "health_threshold": 0,
                 "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
                 ],
                 "hwqual": true,
                 "image_test": true,
@@ -36827,11 +35509,11 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "lemmings-release-afdo-use",
+                "name": "parrot_ivb-release",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
-                "paygen": false,
+                "paygen": true,
                 "paygen_skip_delta_payloads": false,
                 "paygen_skip_testing": false,
                 "postsync_patch": true,
@@ -36839,7 +35521,7 @@
                 "pre_cq": false,
                 "prebuilts": false,
                 "profile": null,
-                "push_image": false,
+                "push_image": true,
                 "push_overlays": null,
                 "quick_unit": false,
                 "rootfs_verification": true,
@@ -36848,9 +35530,9 @@
                 "signer_tests": true,
                 "sync_chrome": null,
                 "tests_supported": true,
-                "trybot_list": false,
+                "trybot_list": true,
                 "unittest_blacklist": [],
-                "unittests": true,
+                "unittests": null,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -36866,11 +35548,7 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
+                "vm_tests": []
             }
         ],
         "chrome_binhost_only": false,
@@ -36885,8 +35563,8 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal); Group config (boards: stout, parrot_ivb)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -36899,12 +35577,10 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
         ],
         "hwqual": true,
         "image_test": true,
@@ -36913,18 +35589,18 @@
             "test",
             "factory_install"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "lemmings-release-afdo",
+        "name": "ivybridge-release-group",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -36932,7 +35608,7 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
@@ -36941,7 +35617,7 @@
         "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
@@ -36965,84 +35641,80 @@
             "cros_vm_test"
         ]
     },
-    "lemmings-release-afdo-generate": {
+    "kayle-paladin": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
-        "afdo_use": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lemmings"
+            "kayle"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "canary",
+        "build_tests": false,
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Commit Queue (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
+        "hw_tests": [],
+        "hwqual": false,
         "image_test": true,
         "images": [
             "base",
-            "test",
-            "factory_install"
+            "dev"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "kayle.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "lemmings-release-afdo-generate",
+        "name": "kayle-paladin",
         "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
+        "packages": [
+            "virtual/target-os",
+            "virtual/target-os-dev",
+            "chromeos-base/chromeos-initramfs"
+        ],
+        "paladin_builder_name": "kayle paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
+        "paygen_skip_testing": true,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -37050,38 +35722,32 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
+            "chrome_internal"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "lemmings-release-afdo-use": {
+    "kayle-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -37089,7 +35755,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "lemmings"
+            "kayle"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -37099,7 +35765,7 @@
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -37122,14 +35788,7 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": true,
         "image_test": true,
         "images": [
@@ -37140,11 +35799,11 @@
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "kayle.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "lemmings-release-afdo-use",
+        "name": "kayle-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -37156,18 +35815,18 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
+        "sync_chrome": false,
+        "tests_supported": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -37183,13 +35842,9 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "lemmings-tot-chrome-pfq-informational": {
+    "kip-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -37201,7 +35856,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lemmings"
+            "kip"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -37210,8 +35865,8 @@
         "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -37221,7 +35876,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chrome Uprev & Build (internal)",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -37245,9 +35900,9 @@
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "lemmings-tot-chrome-pfq-informational",
+        "name": "kip-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -37257,7 +35912,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -37276,7 +35931,7 @@
         "upload_symbols": false,
         "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
             "chrome_internal"
@@ -37285,10 +35940,10 @@
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": [
-            "smoke_suite"
+            "pfq_suite"
         ]
     },
-    "lemmings-tot-chromium-pfq-informational": {
+    "kip-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -37300,7 +35955,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lemmings"
+            "kip"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -37309,8 +35964,8 @@
         "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -37320,7 +35975,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -37340,14 +35995,14 @@
             "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "lemmings-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "name": "kip-chromium-pfq",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -37356,7 +36011,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -37375,39 +36030,39 @@
         "upload_symbols": false,
         "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": [
-            "smoke_suite"
+            "pfq_suite"
         ]
     },
-    "leon-chrome-pfq": {
+    "kip-depthcharge-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "leon"
+            "kip"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
+        "build_tests": false,
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -37417,13 +36072,13 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Firmware Canary",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -37431,11 +36086,9 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": false,
+        "hwqual": true,
         "image_test": false,
-        "images": [
-            "test"
-        ],
+        "images": [],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
@@ -37443,9 +36096,11 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "leon-chrome-pfq",
+        "name": "kip-depthcharge-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -37453,60 +36108,58 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
+        "sync_chrome": false,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "depthcharge"
         ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "leon-chromium-pfq": {
+    "kip-depthcharge-full-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "leon"
+            "kip"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
+        "build_tests": false,
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -37516,15 +36169,15 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Firmware Informational",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
@@ -37532,19 +36185,19 @@
         "hw_tests": [],
         "hwqual": false,
         "image_test": false,
-        "images": [
-            "test"
-        ],
+        "images": [],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_version": false,
         "master": false,
-        "name": "leon-chromium-pfq",
+        "name": "kip-depthcharge-full-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -37552,7 +36205,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -37561,27 +36214,27 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
+        "sync_chrome": false,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "depthcharge"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "leon-depthcharge-firmware": {
+    "kip-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -37593,7 +36246,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "leon"
+            "kip"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -37637,201 +36290,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "leon-depthcharge-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "depthcharge"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "leon-depthcharge-full-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "leon"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "full",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Informational",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": true,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
-        "master": false,
-        "name": "leon-depthcharge-full-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "depthcharge"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "leon-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "leon"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Canary",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "leon-firmware",
+        "name": "kip-firmware",
         "overlays": "both",
         "packages": [
             "virtual/chromeos-firmware"
@@ -37874,7 +36333,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "leon-full": {
+    "kip-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -37886,7 +36345,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "leon"
+            "kip"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -37934,7 +36393,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "leon-full",
+        "name": "kip-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -37973,7 +36432,7 @@
             "pfq_suite"
         ]
     },
-    "leon-paladin": {
+    "kip-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -37985,7 +36444,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "leon"
+            "kip"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -38024,17 +36483,17 @@
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "leon-paladin",
+        "name": "kip-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "leon paladin",
+        "paladin_builder_name": "kip paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -38070,7 +36529,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "leon-payloads": {
+    "kip-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -38082,7 +36541,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "leon"
+            "kip"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -38128,7 +36587,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "leon-payloads",
+        "name": "kip-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -38165,7 +36624,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "leon-release": {
+    "kip-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -38177,7 +36636,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "leon"
+            "kip"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -38230,7 +36689,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "leon-release",
+        "name": "kip-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -38275,7 +36734,7 @@
             "cros_vm_test"
         ]
     },
-    "leon-release-afdo": {
+    "kip-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -38287,7 +36746,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "leon"
+            "kip"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -38307,7 +36766,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "leon"
+                    "kip"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -38362,7 +36821,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "leon-release-afdo-generate",
+                "name": "kip-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -38419,7 +36878,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "leon"
+                    "kip"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -38474,7 +36933,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "leon-release-afdo-use",
+                "name": "kip-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -38567,7 +37026,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "leon-release-afdo",
+        "name": "kip-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -38612,7 +37071,7 @@
             "cros_vm_test"
         ]
     },
-    "leon-release-afdo-generate": {
+    "kip-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -38624,7 +37083,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "leon"
+            "kip"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -38679,7 +37138,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "leon-release-afdo-generate",
+        "name": "kip-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -38724,7 +37183,7 @@
             "cros_vm_test"
         ]
     },
-    "leon-release-afdo-use": {
+    "kip-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -38736,7 +37195,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "leon"
+            "kip"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -38791,7 +37250,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "leon-release-afdo-use",
+        "name": "kip-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -38836,7 +37295,7 @@
             "cros_vm_test"
         ]
     },
-    "leon-tot-chrome-pfq-informational": {
+    "kip-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -38848,7 +37307,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "leon"
+            "kip"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -38894,7 +37353,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "leon-tot-chrome-pfq-informational",
+        "name": "kip-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -38935,7 +37394,7 @@
             "smoke_suite"
         ]
     },
-    "leon-tot-chromium-pfq-informational": {
+    "kip-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -38947,7 +37406,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "leon"
+            "kip"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -38993,7 +37452,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "leon-tot-chromium-pfq-informational",
+        "name": "kip-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -39032,7 +37491,7 @@
             "smoke_suite"
         ]
     },
-    "link-chrome-pfq": {
+    "lemmings-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -39044,7 +37503,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "link"
+            "lemmings"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -39090,7 +37549,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link-chrome-pfq",
+        "name": "lemmings-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -39131,7 +37590,7 @@
             "pfq_suite"
         ]
     },
-    "link-chromium-pfq": {
+    "lemmings-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -39143,7 +37602,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "link"
+            "lemmings"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -39189,7 +37648,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link-chromium-pfq",
+        "name": "lemmings-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -39228,300 +37687,7 @@
             "pfq_suite"
         ]
     },
-    "link-depthcharge-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "link"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Canary",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "link-depthcharge-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "depthcharge"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "link-depthcharge-full-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "link"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "full",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Informational",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": true,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
-        "master": false,
-        "name": "link-depthcharge-full-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "depthcharge"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "link-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "link"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Canary",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "link-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "link-full": {
+    "lemmings-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -39533,7 +37699,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "link"
+            "lemmings"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -39581,7 +37747,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "link-full",
+        "name": "lemmings-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -39620,7 +37786,7 @@
             "pfq_suite"
         ]
     },
-    "link-paladin": {
+    "lemmings-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -39632,7 +37798,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "link"
+            "lemmings"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -39642,7 +37808,7 @@
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -39665,26 +37831,23 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": false,
         "image_test": false,
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link-paladin",
+        "name": "lemmings-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "link paladin",
+        "paladin_builder_name": "lemmings paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -39700,7 +37863,7 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
+        "sync_chrome": false,
         "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
@@ -39720,114 +37883,19 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "link-payloads": {
+    "lemmings-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "link"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "payloads",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Regenerate release payloads.",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "link-payloads",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "link-release": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": true,
-        "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
         "binhost_bucket": "gs://chromeos-dev-installer",
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "link"
+            "lemmings"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -39837,7 +37905,7 @@
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -39848,7 +37916,7 @@
         "critical_for_chrome": false,
         "debug_symbols": true,
         "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -39860,12 +37928,7 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": true,
         "image_test": true,
         "images": [
@@ -39873,20 +37936,20 @@
             "test",
             "factory_install"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link-release",
+        "name": "lemmings-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
+        "paygen_skip_testing": true,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
@@ -39898,8 +37961,8 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
+        "signer_tests": false,
+        "sync_chrome": false,
         "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
@@ -39914,19 +37977,14 @@
         "useflags": [
             "chrome_internal",
             "-cros-debug",
-            "-highdpi",
-            "highdpi"
+            "-highdpi"
         ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "link-release-afdo": {
+    "lemmings-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -39938,7 +37996,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "link"
+            "lemmings"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -39958,7 +38016,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "link"
+                    "lemmings"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -40013,7 +38071,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "link-release-afdo-generate",
+                "name": "lemmings-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -40070,7 +38128,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "link"
+                    "lemmings"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -40125,7 +38183,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "link-release-afdo-use",
+                "name": "lemmings-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -40218,7 +38276,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link-release-afdo",
+        "name": "lemmings-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -40263,7 +38321,7 @@
             "cros_vm_test"
         ]
     },
-    "link-release-afdo-generate": {
+    "lemmings-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -40275,7 +38333,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "link"
+            "lemmings"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -40330,7 +38388,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link-release-afdo-generate",
+        "name": "lemmings-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -40375,7 +38433,7 @@
             "cros_vm_test"
         ]
     },
-    "link-release-afdo-use": {
+    "lemmings-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -40387,7 +38445,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "link"
+            "lemmings"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -40442,7 +38500,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link-release-afdo-use",
+        "name": "lemmings-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -40487,7 +38545,7 @@
             "cros_vm_test"
         ]
     },
-    "link-tot-chrome-pfq-informational": {
+    "lemmings-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -40499,7 +38557,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "link"
+            "lemmings"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -40545,7 +38603,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "link-tot-chrome-pfq-informational",
+        "name": "lemmings-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -40586,7 +38644,7 @@
             "smoke_suite"
         ]
     },
-    "link-tot-chromium-pfq-informational": {
+    "lemmings-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -40598,7 +38656,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "link"
+            "lemmings"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -40644,7 +38702,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "link-tot-chromium-pfq-informational",
+        "name": "lemmings-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -40683,7 +38741,7 @@
             "smoke_suite"
         ]
     },
-    "link-tot-paladin": {
+    "leon-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -40695,31 +38753,31 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "link"
+            "leon"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue (internal)",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
-        "do_not_apply_cq_patches": true,
+        "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
@@ -40728,33 +38786,30 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"tot-cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"tot-cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": false,
         "image_test": false,
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link-tot-paladin",
+        "name": "leon-chrome-pfq",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "link ToT paladin",
+        "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -40765,13 +38820,13 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -40781,9 +38836,11 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "link_freon-chrome-pfq": {
+    "leon-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -40795,7 +38852,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "link_freon"
+            "leon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -40808,14 +38865,14 @@
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -40841,7 +38898,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link_freon-chrome-pfq",
+        "name": "leon-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -40851,7 +38908,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -40872,37 +38929,134 @@
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "leon-depthcharge-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "leon"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "leon-depthcharge-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "depthcharge"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "link_freon-chromium-pfq": {
+    "leon-depthcharge-full-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "link_freon"
+            "leon"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
+        "build_tests": false,
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -40912,15 +39066,15 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Firmware Informational",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
@@ -40928,9 +39082,104 @@
         "hw_tests": [],
         "hwqual": false,
         "image_test": false,
-        "images": [
-            "test"
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": false,
+        "master": false,
+        "name": "leon-depthcharge-full-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "depthcharge"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "leon-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "leon"
         ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": true,
+        "image_test": false,
+        "images": [],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
@@ -40938,9 +39187,11 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link_freon-chromium-pfq",
+        "name": "leon-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -40948,36 +39199,38 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
+        "sync_chrome": false,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "link_freon-full": {
+    "leon-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -40989,7 +39242,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "link_freon"
+            "leon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -41037,7 +39290,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "link_freon-full",
+        "name": "leon-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -41076,7 +39329,7 @@
             "pfq_suite"
         ]
     },
-    "link_freon-paladin": {
+    "leon-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -41088,7 +39341,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "link_freon"
+            "leon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -41127,17 +39380,17 @@
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link_freon-paladin",
+        "name": "leon-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "link_freon paladin",
+        "paladin_builder_name": "leon paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -41168,12 +39421,12 @@
         "useflags": [
             "chrome_internal"
         ],
-        "usepkg_build_packages": false,
+        "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "link_freon-payloads": {
+    "leon-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -41185,7 +39438,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "link_freon"
+            "leon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -41231,7 +39484,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link_freon-payloads",
+        "name": "leon-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -41268,7 +39521,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "link_freon-release": {
+    "leon-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -41280,7 +39533,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "link_freon"
+            "leon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -41313,7 +39566,12 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": true,
         "image_test": true,
         "images": [
@@ -41321,20 +39579,20 @@
             "test",
             "factory_install"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link_freon-release",
+        "name": "leon-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": true,
         "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": true,
+        "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
@@ -41362,15 +39620,18 @@
         "useflags": [
             "chrome_internal",
             "-cros-debug",
-            "-highdpi",
-            "highdpi"
+            "-highdpi"
         ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "link_freon-release-afdo": {
+    "leon-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -41382,7 +39643,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "link_freon"
+            "leon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -41402,7 +39663,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "link_freon"
+                    "leon"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -41457,7 +39718,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "link_freon-release-afdo-generate",
+                "name": "leon-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -41514,7 +39775,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "link_freon"
+                    "leon"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -41569,7 +39830,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "link_freon-release-afdo-use",
+                "name": "leon-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -41662,7 +39923,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link_freon-release-afdo",
+        "name": "leon-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -41707,7 +39968,7 @@
             "cros_vm_test"
         ]
     },
-    "link_freon-release-afdo-generate": {
+    "leon-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -41719,7 +39980,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "link_freon"
+            "leon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -41774,7 +40035,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link_freon-release-afdo-generate",
+        "name": "leon-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -41819,7 +40080,7 @@
             "cros_vm_test"
         ]
     },
-    "link_freon-release-afdo-use": {
+    "leon-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -41831,7 +40092,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "link_freon"
+            "leon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -41886,7 +40147,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "link_freon-release-afdo-use",
+        "name": "leon-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -41931,7 +40192,7 @@
             "cros_vm_test"
         ]
     },
-    "link_freon-tot-chrome-pfq-informational": {
+    "leon-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -41943,7 +40204,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "link_freon"
+            "leon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -41989,7 +40250,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "link_freon-tot-chrome-pfq-informational",
+        "name": "leon-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -42030,7 +40291,7 @@
             "smoke_suite"
         ]
     },
-    "link_freon-tot-chromium-pfq-informational": {
+    "leon-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -42042,7 +40303,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "link_freon"
+            "leon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -42088,7 +40349,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "link_freon-tot-chromium-pfq-informational",
+        "name": "leon-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -42127,7 +40388,7 @@
             "smoke_suite"
         ]
     },
-    "lumpy-chrome-perf": {
+    "link-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -42139,7 +40400,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lumpy"
+            "link"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -42148,8 +40409,8 @@
         "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -42159,7 +40420,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Chrome Performance test bot",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -42172,9 +40433,7 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": true,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 5400,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": false,
         "image_test": false,
         "images": [
@@ -42185,9 +40444,9 @@
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "lumpy-chrome-perf",
+        "name": "link-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -42197,7 +40456,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -42208,27 +40467,28 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": false,
-        "use_chrome_lkgm": true,
+        "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal",
-            "-cros-debug"
+            "chrome_internal"
         ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "lumpy-chrome-pfq": {
-        "afdo_generate": true,
+    "link-chromium-pfq": {
+        "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
@@ -42239,7 +40499,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lumpy"
+            "link"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -42252,14 +40512,14 @@
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -42272,22 +40532,20 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"suites\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"AFDO_record\",\n    \"timeout\": 5400,\n    \"warn_only\": true\n}"
-        ],
+        "hw_tests": [],
         "hwqual": false,
         "image_test": false,
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "lumpy-chrome-pfq",
+        "name": "link-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -42297,7 +40555,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -42318,9 +40576,7 @@
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
@@ -42328,29 +40584,126 @@
             "pfq_suite"
         ]
     },
-    "lumpy-chromium-pfq": {
+    "link-depthcharge-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "link"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "link-depthcharge-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "depthcharge"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "link-depthcharge-full-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lumpy"
+            "link"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
+        "build_tests": false,
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -42360,15 +40713,15 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Firmware Informational",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
@@ -42376,19 +40729,19 @@
         "hw_tests": [],
         "hwqual": false,
         "image_test": false,
-        "images": [
-            "test"
-        ],
+        "images": [],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_version": false,
         "master": false,
-        "name": "lumpy-chromium-pfq",
+        "name": "link-depthcharge-full-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -42396,7 +40749,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -42405,27 +40758,27 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
+        "sync_chrome": false,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "depthcharge"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "lumpy-firmware": {
+    "link-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -42437,7 +40790,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "lumpy"
+            "link"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -42481,7 +40834,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "lumpy-firmware",
+        "name": "link-firmware",
         "overlays": "both",
         "packages": [
             "virtual/chromeos-firmware"
@@ -42524,7 +40877,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "lumpy-full": {
+    "link-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -42536,7 +40889,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lumpy"
+            "link"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -42584,7 +40937,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "lumpy-full",
+        "name": "link-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -42623,104 +40976,7 @@
             "pfq_suite"
         ]
     },
-    "lumpy-incremental-paladin": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "lumpy"
-        ],
-        "branch": false,
-        "build_before_patching": true,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "paladin",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
-        "compilecheck": true,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Commit Queue (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": true,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "lumpy-incremental-paladin",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": "lumpy incremental paladin",
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "lumpy-paladin": {
+    "link-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -42732,7 +40988,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lumpy"
+            "link"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -42781,10 +41037,10 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "lumpy-paladin",
+        "name": "link-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "lumpy paladin",
+        "paladin_builder_name": "link paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -42820,7 +41076,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "lumpy-payloads": {
+    "link-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -42832,7 +41088,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lumpy"
+            "link"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -42878,7 +41134,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "lumpy-payloads",
+        "name": "link-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -42915,207 +41171,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "lumpy-pre-cq": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": false,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "lumpy"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": true,
-        "build_tests": true,
-        "build_type": "binary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": false,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": true,
-        "cpe_export": false,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": false,
-        "description": "Verifies compilation only",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": true,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "lumpy-pre-cq",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": true,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
-    },
-    "lumpy-pre-flight-branch": {
-        "afdo_generate": true,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": true,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "lumpy"
-        ],
-        "branch": true,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "pfq",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": null,
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"suites\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"AFDO_record\",\n    \"timeout\": 5400,\n    \"warn_only\": true\n}"
-        ],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": true,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": true,
-        "name": "lumpy-pre-flight-branch",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "private",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": "both",
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": true,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
-    },
-    "lumpy-release": {
+    "link-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -43127,7 +41183,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "lumpy"
+            "link"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -43145,7 +41201,7 @@
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
-        "critical_for_chrome": true,
+        "critical_for_chrome": false,
         "debug_symbols": true,
         "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": true,
@@ -43173,14 +41229,14 @@
             "test",
             "factory_install"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "lumpy-release",
+        "name": "link-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -43214,7 +41270,8 @@
         "useflags": [
             "chrome_internal",
             "-cros-debug",
-            "-highdpi"
+            "-highdpi",
+            "highdpi"
         ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
@@ -43225,7 +41282,7 @@
             "cros_vm_test"
         ]
     },
-    "lumpy-release-afdo": {
+    "link-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -43237,7 +41294,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "lumpy"
+            "link"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -43257,7 +41314,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "lumpy"
+                    "link"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -43312,7 +41369,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "lumpy-release-afdo-generate",
+                "name": "link-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -43369,7 +41426,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "lumpy"
+                    "link"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -43424,7 +41481,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "lumpy-release-afdo-use",
+                "name": "link-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -43517,7 +41574,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "lumpy-release-afdo",
+        "name": "link-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -43562,7 +41619,7 @@
             "cros_vm_test"
         ]
     },
-    "lumpy-release-afdo-generate": {
+    "link-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -43574,7 +41631,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "lumpy"
+            "link"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -43629,7 +41686,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "lumpy-release-afdo-generate",
+        "name": "link-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -43674,7 +41731,7 @@
             "cros_vm_test"
         ]
     },
-    "lumpy-release-afdo-use": {
+    "link-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -43686,7 +41743,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "lumpy"
+            "link"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -43741,7 +41798,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "lumpy-release-afdo-use",
+        "name": "link-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -43786,7 +41843,7 @@
             "cros_vm_test"
         ]
     },
-    "lumpy-tot-chrome-pfq-informational": {
+    "link-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -43798,7 +41855,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lumpy"
+            "link"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -43844,7 +41901,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "lumpy-tot-chrome-pfq-informational",
+        "name": "link-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -43885,7 +41942,7 @@
             "smoke_suite"
         ]
     },
-    "lumpy-tot-chromium-pfq-informational": {
+    "link-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -43897,7 +41954,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lumpy"
+            "link"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -43943,7 +42000,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "lumpy-tot-chromium-pfq-informational",
+        "name": "link-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -43982,7 +42039,7 @@
             "smoke_suite"
         ]
     },
-    "lumpy-webrtc-chrome-pfq-informational": {
+    "link-tot-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -43994,31 +42051,31 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "lumpy"
+            "link"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chrome Uprev & Build (internal)",
+        "description": "Commit Queue (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
-        "do_not_apply_cq_patches": false,
+        "do_not_apply_cq_patches": true,
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
@@ -44027,23 +42084,26 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"tot-cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"tot-cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": false,
         "image_test": false,
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "lumpy-webrtc-chrome-pfq-informational",
+        "name": "link-tot-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": null,
+        "paladin_builder_name": "link ToT paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -44061,15 +42121,15 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
             "chrome_internal"
@@ -44077,11 +42137,9 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "mario-incremental": {
+    "link_freon-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -44093,27 +42151,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "x86-mario"
+            "link_freon"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "binary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Incremental Builds (internal)",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -44132,14 +42190,14 @@
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "mario-incremental",
+        "name": "link_freon-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -44149,7 +42207,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -44170,18 +42228,18 @@
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "master-chromium-pfq": {
+    "link_freon-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
-        "afdo_update_ebuild": true,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": false,
@@ -44189,7 +42247,9 @@
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
-        "boards": [],
+        "boards": [
+            "link_freon"
+        ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
@@ -44198,7 +42258,7 @@
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": "latest_release",
-        "chrome_sdk": false,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -44227,14 +42287,14 @@
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
-        "master": true,
-        "name": "master-chromium-pfq",
+        "master": false,
+        "name": "link_freon-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -44247,7 +42307,7 @@
         "prebuilts": "public",
         "profile": null,
         "push_image": false,
-        "push_overlays": "both",
+        "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
@@ -44273,28 +42333,30 @@
             "pfq_suite"
         ]
     },
-    "master-paladin": {
+    "link_freon-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
-        "boards": [],
+        "boards": [
+            "link_freon"
+        ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
@@ -44303,7 +42365,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue master (all others are slaves)",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -44311,102 +42373,99 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
-        "health_alert_recipients": [
-            "chromeos-build-alerts@google.com",
-            "tree",
-            "build",
-            "lab"
-        ],
-        "health_threshold": 3,
+        "health_alert_recipients": [],
+        "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
-        "important": true,
-        "internal": true,
+        "important": false,
+        "internal": false,
         "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": true,
-        "name": "master-paladin",
-        "overlays": "both",
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "link_freon-full",
+        "overlays": "public",
         "packages": [],
-        "paladin_builder_name": "CQ master",
+        "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
-        "push_overlays": "both",
+        "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
-        "sanity_check_slaves": [
-            "link-tot-paladin"
-        ],
+        "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "master-release": {
+    "link_freon-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
-        "boards": [],
+        "boards": [
+            "link_freon"
+        ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
+        "description": "Commit Queue (internal)",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -44416,25 +42475,13 @@
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
-        "health_alert_recipients": [
-            "chromeos-build-alerts@google.com",
-            "tree",
-            "build",
-            "lab"
-        ],
+        "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
@@ -44442,53 +42489,47 @@
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
-        "master": true,
-        "name": "master-release",
+        "master": false,
+        "name": "link_freon-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
+        "paladin_builder_name": "link_freon paladin",
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": false,
+        "signer_tests": false,
+        "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
+            "chrome_internal"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "mccloud-chrome-pfq": {
+    "link_freon-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -44500,27 +42541,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mccloud"
+            "link_freon"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
+        "chromeos_official": false,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -44546,302 +42587,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "mccloud-chrome-pfq",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "private",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
-    },
-    "mccloud-chromium-pfq": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "mccloud"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "mccloud-chromium-pfq",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "public",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
-    },
-    "mccloud-full": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "mccloud"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "full",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Full Builds",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": true,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": false,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
-        "master": false,
-        "name": "mccloud-full",
-        "overlays": "public",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "public",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
-    },
-    "mccloud-payloads": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "mccloud"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "payloads",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Regenerate release payloads.",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "mccloud-payloads",
+        "name": "link_freon-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -44878,7 +42624,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "mccloud-release": {
+    "link_freon-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -44890,7 +42636,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "mccloud"
+            "link_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -44923,12 +42669,7 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": true,
         "image_test": true,
         "images": [
@@ -44936,20 +42677,20 @@
             "test",
             "factory_install"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "mccloud-release",
+        "name": "link_freon-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": true,
         "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
+        "paygen_skip_testing": true,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
@@ -44977,18 +42718,15 @@
         "useflags": [
             "chrome_internal",
             "-cros-debug",
-            "-highdpi"
+            "-highdpi",
+            "highdpi"
         ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "mccloud-release-afdo": {
+    "link_freon-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -45000,7 +42738,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "mccloud"
+            "link_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -45020,7 +42758,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "mccloud"
+                    "link_freon"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -45075,7 +42813,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "mccloud-release-afdo-generate",
+                "name": "link_freon-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -45132,7 +42870,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "mccloud"
+                    "link_freon"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -45187,7 +42925,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "mccloud-release-afdo-use",
+                "name": "link_freon-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -45280,7 +43018,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "mccloud-release-afdo",
+        "name": "link_freon-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -45325,7 +43063,7 @@
             "cros_vm_test"
         ]
     },
-    "mccloud-release-afdo-generate": {
+    "link_freon-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -45337,7 +43075,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "mccloud"
+            "link_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -45392,7 +43130,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "mccloud-release-afdo-generate",
+        "name": "link_freon-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -45437,7 +43175,7 @@
             "cros_vm_test"
         ]
     },
-    "mccloud-release-afdo-use": {
+    "link_freon-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -45449,7 +43187,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "mccloud"
+            "link_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -45504,7 +43242,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "mccloud-release-afdo-use",
+        "name": "link_freon-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -45549,7 +43287,7 @@
             "cros_vm_test"
         ]
     },
-    "mccloud-tot-chrome-pfq-informational": {
+    "link_freon-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -45561,7 +43299,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mccloud"
+            "link_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -45607,7 +43345,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "mccloud-tot-chrome-pfq-informational",
+        "name": "link_freon-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -45648,7 +43386,7 @@
             "smoke_suite"
         ]
     },
-    "mccloud-tot-chromium-pfq-informational": {
+    "link_freon-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -45660,7 +43398,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mccloud"
+            "link_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -45706,7 +43444,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "mccloud-tot-chromium-pfq-informational",
+        "name": "link_freon-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -45745,7 +43483,7 @@
             "smoke_suite"
         ]
     },
-    "mipseb-n32-generic-chromium-pfq": {
+    "lumpy-chrome-perf": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -45757,7 +43495,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mipseb-n32-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -45766,18 +43504,18 @@
         "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Chrome Performance test bot",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -45790,7 +43528,9 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": true,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 5400,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": false,
         "image_test": false,
         "images": [
@@ -45801,9 +43541,9 @@
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_version": false,
         "master": false,
-        "name": "mipseb-n32-generic-chromium-pfq",
+        "name": "lumpy-chrome-perf",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -45813,7 +43553,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -45823,56 +43563,59 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
+        "tests_supported": true,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": false,
-        "use_chrome_lkgm": false,
+        "use_chrome_lkgm": true,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "mipseb-n32-generic-full": {
-        "afdo_generate": false,
+    "lumpy-chrome-pfq": {
+        "afdo_generate": true,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mipseb-n32-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -45880,28 +43623,28 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"suites\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"AFDO_record\",\n    \"timeout\": 5400,\n    \"warn_only\": true\n}"
+        ],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
-        "important": false,
-        "internal": false,
+        "important": true,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "mipseb-n32-generic-full",
-        "overlays": "public",
+        "name": "lumpy-chrome-pfq",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -45910,7 +43653,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -45920,24 +43663,28 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
+        "tests_supported": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "mipseb-n32-generic-tot-chromium-pfq-informational": {
+    "lumpy-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -45949,7 +43696,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mipseb-n32-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -45958,8 +43705,8 @@
         "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -45969,7 +43716,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -45989,14 +43736,14 @@
             "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "mipseb-n32-generic-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "name": "lumpy-chromium-pfq",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -46005,7 +43752,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -46015,62 +43762,64 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "mipseb-n64-generic-chromium-pfq": {
+    "lumpy-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "mipseb-n64-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
+        "build_tests": false,
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Firmware Canary",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -46078,11 +43827,9 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": false,
+        "hwqual": true,
         "image_test": false,
-        "images": [
-            "test"
-        ],
+        "images": [],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
@@ -46090,9 +43837,11 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "mipseb-n64-generic-chromium-pfq",
+        "name": "lumpy-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -46100,34 +43849,38 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": false,
+        "sync_chrome": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
-        "upload_hw_test_artifacts": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "mipseb-n64-generic-full": {
+    "lumpy-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -46139,7 +43892,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mipseb-n64-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -46187,7 +43940,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "mipseb-n64-generic-full",
+        "name": "lumpy-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -46207,10 +43960,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -46222,9 +43975,11 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "mipseb-n64-generic-tot-chromium-pfq-informational": {
+    "lumpy-incremental-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -46236,27 +43991,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mipseb-n64-generic"
+            "lumpy"
         ],
         "branch": false,
-        "build_before_patching": false,
+        "build_before_patching": true,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
+        "chroot_replace": false,
+        "compilecheck": true,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Commit Queue (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -46275,17 +44030,17 @@
         "images": [
             "test"
         ],
-        "important": false,
-        "internal": false,
+        "important": true,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "mipseb-n64-generic-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "name": "lumpy-incremental-paladin",
+        "overlays": "both",
         "packages": [],
-        "paladin_builder_name": null,
+        "paladin_builder_name": "lumpy incremental paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -46302,24 +44057,26 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
+        "tests_supported": true,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "mipseb-o32-generic-chromium-pfq": {
+    "lumpy-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -46331,18 +44088,18 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mipseb-o32-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
@@ -46351,7 +44108,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Commit Queue (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -46364,30 +44121,33 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": false,
         "image_test": false,
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "mipseb-o32-generic-chromium-pfq",
+        "name": "lumpy-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": null,
+        "paladin_builder_name": "lumpy paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -46397,56 +44157,58 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
+        "tests_supported": true,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "mipseb-o32-generic-full": {
+    "lumpy-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mipseb-o32-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": true,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -46454,37 +44216,35 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "mipseb-o32-generic-full",
-        "overlays": "public",
+        "name": "lumpy-payloads",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -46494,11 +44254,11 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
+        "tests_supported": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
+        "unittests": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": true,
@@ -46506,44 +44266,44 @@
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "mipseb-o32-generic-tot-chromium-pfq-informational": {
+    "lumpy-pre-cq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
-        "archive": true,
+        "archive": false,
         "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mipseb-o32-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
-        "build_packages_in_background": false,
+        "build_packages_in_background": true,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "binary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
+        "chrome_rev": null,
         "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
+        "compilecheck": true,
+        "cpe_export": false,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "debug_symbols": false,
+        "description": "Verifies compilation only",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -46562,15 +44322,15 @@
         "images": [
             "test"
         ],
-        "important": false,
-        "internal": false,
+        "important": true,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "mipseb-o32-generic-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "name": "lumpy-pre-cq",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -46578,7 +44338,7 @@
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
-        "pre_cq": false,
+        "pre_cq": true,
         "prebuilts": false,
         "profile": null,
         "push_image": false,
@@ -46589,27 +44349,31 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
+        "tests_supported": true,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite"
+        ]
     },
-    "mipsel-n32-generic-chromium-pfq": {
-        "afdo_generate": false,
+    "lumpy-pre-flight-branch": {
+        "afdo_generate": true,
         "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": false,
@@ -46618,17 +44382,17 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mipsel-n32-generic"
+            "lumpy"
         ],
-        "branch": false,
+        "branch": true,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "pfq",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -46638,7 +44402,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": null,
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -46651,20 +44415,22 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"suites\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"AFDO_record\",\n    \"timeout\": 5400,\n    \"warn_only\": true\n}"
+        ],
         "hwqual": false,
         "image_test": false,
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
-        "master": false,
-        "name": "mipsel-n32-generic-chromium-pfq",
+        "master": true,
+        "name": "lumpy-pre-flight-branch",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -46674,80 +44440,89 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
-        "push_overlays": null,
+        "push_overlays": "both",
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": false,
+        "sync_chrome": true,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "mipsel-n32-generic-full": {
+    "lumpy-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "mipsel-n32-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
-        "critical_for_chrome": false,
+        "critical_for_chrome": true,
         "debug_symbols": true,
-        "description": "Full Builds",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
         "image_test": true,
         "images": [
             "base",
@@ -46755,82 +44530,315 @@
             "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "mipsel-n32-generic-full",
-        "overlays": "public",
+        "name": "lumpy-release",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "mipsel-n32-generic-tot-chromium-pfq-informational": {
+    "lumpy-release-afdo": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "mipsel-n32-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
-        "child_configs": [],
+        "build_type": "canary",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": true,
+                "afdo_update_ebuild": true,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "lumpy"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "lumpy-release-afdo-generate",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "lumpy"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "lumpy-release-afdo-use",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
+            }
+        ],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -46843,21 +44851,30 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "mipsel-n32-generic-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "name": "lumpy-release-afdo",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -46874,58 +44891,66 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "mipsel-n64-generic-chromium-pfq": {
+    "lumpy-release-afdo-generate": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "mipsel-n64-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -46938,20 +44963,29 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "mipsel-n64-generic-chromium-pfq",
+        "name": "lumpy-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -46961,7 +44995,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -46969,58 +45003,66 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "mipsel-n64-generic-full": {
+    "lumpy-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "mipsel-n64-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -47028,13 +45070,20 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
         "image_test": true,
         "images": [
             "base",
@@ -47042,14 +45091,14 @@
             "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "mipsel-n64-generic-full",
-        "overlays": "public",
+        "name": "lumpy-release-afdo-use",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -47058,7 +45107,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -47066,26 +45115,34 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
+        "tests_supported": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "mipsel-n64-generic-tot-chromium-pfq-informational": {
+    "lumpy-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -47097,7 +45154,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mipsel-n64-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -47110,14 +45167,14 @@
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Informational Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -47137,14 +45194,14 @@
             "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "mipsel-n64-generic-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "name": "lumpy-tot-chrome-pfq-informational",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -47163,10 +45220,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -47174,13 +45231,17 @@
         "use_chrome_lkgm": false,
         "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite"
+        ]
     },
-    "mipsel-o32-generic-chromium-pfq": {
+    "lumpy-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -47192,7 +45253,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mipsel-o32-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -47201,8 +45262,8 @@
         "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -47212,7 +45273,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Informational Chromium Uprev & Build (public)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -47232,14 +45293,14 @@
             "test"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "mipsel-o32-generic-chromium-pfq",
-        "overlays": "both",
+        "name": "lumpy-tot-chromium-pfq-informational",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -47248,7 +45309,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -47258,93 +45319,90 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
         "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite"
+        ]
     },
-    "mipsel-o32-generic-full": {
+    "lumpy-webrtc-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mipsel-o32-generic"
+            "lumpy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "full",
+        "build_tests": true,
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "tot",
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
+        "description": "Informational Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "dev"
+            "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "mipsel-o32-generic-full",
-        "overlays": "public",
-        "packages": [
-            "virtual/target-os",
-            "virtual/target-os-dev",
-            "chromeos-base/chromeos-initramfs"
-        ],
+        "name": "lumpy-webrtc-chrome-pfq-informational",
+        "overlays": "both",
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": true,
+        "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
@@ -47357,25 +45415,29 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": false,
-        "trybot_list": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite"
+        ]
     },
-    "mipsel-o32-generic-paladin": {
+    "mario-incremental": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -47387,33 +45449,33 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "mipsel-o32-generic"
+            "x86-mario"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "paladin",
+        "build_tests": true,
+        "build_type": "binary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": false,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": true,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue",
+        "description": "Incremental Builds (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -47422,33 +45484,28 @@
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "dev"
+            "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": false,
         "master": false,
-        "name": "mipsel-o32-generic-paladin",
-        "overlays": "public",
-        "packages": [
-            "virtual/target-os",
-            "virtual/target-os-dev",
-            "chromeos-base/chromeos-initramfs"
-        ],
-        "paladin_builder_name": "mipsel-o32-generic paladin",
+        "name": "mario-incremental",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": true,
+        "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -47457,28 +45514,30 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": false,
-        "trybot_list": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
         "usepkg_build_packages": true,
-        "usepkg_toolchain": false,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "mipsel-o32-generic-payloads": {
+    "master-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": false,
@@ -47486,28 +45545,26 @@
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
-        "boards": [
-            "mipsel-o32-generic"
-        ],
+        "boards": [],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "payloads",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": false,
+        "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Regenerate release payloads.",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -47526,27 +45583,27 @@
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
-        "master": false,
-        "name": "mipsel-o32-generic-payloads",
+        "master": true,
+        "name": "master-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
-        "push_overlays": null,
+        "push_overlays": "both",
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
@@ -47557,10 +45614,10 @@
         "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
-        "upload_hw_test_artifacts": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -47568,146 +45625,144 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "mipsel-o32-generic-release": {
+    "master-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
-        "boards": [
-            "mipsel-o32-generic"
-        ],
+        "boards": [],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
+        "build_tests": true,
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
+        "description": "Commit Queue master (all others are slaves)",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
+        "health_alert_recipients": [
+            "chromeos-build-alerts@google.com",
+            "tree",
+            "build",
+            "lab"
+        ],
+        "health_threshold": 3,
         "hw_tests": [],
-        "hwqual": true,
-        "image_test": true,
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "dev"
+            "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
-        "master": false,
-        "name": "mipsel-o32-generic-release",
+        "master": true,
+        "name": "master-paladin",
         "overlays": "both",
-        "packages": [
-            "virtual/target-os",
-            "virtual/target-os-dev",
-            "chromeos-base/chromeos-initramfs"
-        ],
-        "paladin_builder_name": null,
-        "paygen": true,
-        "paygen_skip_delta_payloads": true,
-        "paygen_skip_testing": true,
+        "packages": [],
+        "paladin_builder_name": "CQ master",
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
-        "push_image": true,
-        "push_overlays": null,
+        "push_image": false,
+        "push_overlays": "both",
         "quick_unit": false,
         "rootfs_verification": true,
-        "sanity_check_slaves": null,
+        "sanity_check_slaves": [
+            "link-tot-paladin"
+        ],
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
+        "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
+            "chrome_internal"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "mipsel-o32-generic-tot-chromium-pfq-informational": {
+    "master-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
-        "boards": [
-            "mipsel-o32-generic"
-        ],
+        "boards": [],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
+        "chrome_rev": null,
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -47717,26 +45772,38 @@
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
-        "health_alert_recipients": [],
+        "health_alert_recipients": [
+            "chromeos-build-alerts@google.com",
+            "tree",
+            "build",
+            "lab"
+        ],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
-        "master": false,
-        "name": "mipsel-o32-generic-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": true,
+        "name": "master-release",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -47744,32 +45811,40 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
+        "signer_tests": true,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "monroe-chrome-pfq": {
+    "mccloud-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -47781,7 +45856,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "monroe"
+            "mccloud"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -47827,7 +45902,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "monroe-chrome-pfq",
+        "name": "mccloud-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -47868,7 +45943,7 @@
             "pfq_suite"
         ]
     },
-    "monroe-chromium-pfq": {
+    "mccloud-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -47880,7 +45955,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "monroe"
+            "mccloud"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -47926,7 +46001,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "monroe-chromium-pfq",
+        "name": "mccloud-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -47965,106 +46040,7 @@
             "pfq_suite"
         ]
     },
-    "monroe-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "monroe"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Canary",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "monroe-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "monroe-full": {
+    "mccloud-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -48076,7 +46052,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "monroe"
+            "mccloud"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -48124,7 +46100,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "monroe-full",
+        "name": "mccloud-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -48163,7 +46139,7 @@
             "pfq_suite"
         ]
     },
-    "monroe-paladin": {
+    "mccloud-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -48175,27 +46151,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "monroe"
+            "mccloud"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": true,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue (internal)",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -48214,24 +46190,24 @@
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "monroe-paladin",
+        "name": "mccloud-payloads",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "monroe paladin",
-        "paygen": false,
+        "paladin_builder_name": null,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -48242,120 +46218,23 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "monroe-payloads": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "monroe"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "payloads",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Regenerate release payloads.",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "monroe-payloads",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "monroe-release": {
+    "mccloud-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -48367,7 +46246,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "monroe"
+            "mccloud"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -48420,7 +46299,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "monroe-release",
+        "name": "mccloud-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -48465,7 +46344,7 @@
             "cros_vm_test"
         ]
     },
-    "monroe-release-afdo": {
+    "mccloud-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -48477,7 +46356,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "monroe"
+            "mccloud"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -48497,7 +46376,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "monroe"
+                    "mccloud"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -48552,7 +46431,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "monroe-release-afdo-generate",
+                "name": "mccloud-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -48609,7 +46488,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "monroe"
+                    "mccloud"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -48664,7 +46543,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "monroe-release-afdo-use",
+                "name": "mccloud-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -48757,7 +46636,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "monroe-release-afdo",
+        "name": "mccloud-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -48802,7 +46681,7 @@
             "cros_vm_test"
         ]
     },
-    "monroe-release-afdo-generate": {
+    "mccloud-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -48814,7 +46693,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "monroe"
+            "mccloud"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -48869,7 +46748,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "monroe-release-afdo-generate",
+        "name": "mccloud-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -48914,7 +46793,7 @@
             "cros_vm_test"
         ]
     },
-    "monroe-release-afdo-use": {
+    "mccloud-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -48926,7 +46805,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "monroe"
+            "mccloud"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -48981,7 +46860,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "monroe-release-afdo-use",
+        "name": "mccloud-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -49026,7 +46905,7 @@
             "cros_vm_test"
         ]
     },
-    "monroe-tot-chrome-pfq-informational": {
+    "mccloud-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -49038,7 +46917,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "monroe"
+            "mccloud"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -49084,7 +46963,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "monroe-tot-chrome-pfq-informational",
+        "name": "mccloud-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -49125,7 +47004,7 @@
             "smoke_suite"
         ]
     },
-    "monroe-tot-chromium-pfq-informational": {
+    "mccloud-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -49137,7 +47016,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "monroe"
+            "mccloud"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -49183,7 +47062,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "monroe-tot-chromium-pfq-informational",
+        "name": "mccloud-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -49222,7 +47101,7 @@
             "smoke_suite"
         ]
     },
-    "nyan-chrome-pfq": {
+    "mipseb-n32-generic-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -49234,7 +47113,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan"
+            "mipseb-n32-generic"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -49247,14 +47126,14 @@
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -49280,7 +47159,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan-chrome-pfq",
+        "name": "mipseb-n32-generic-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -49290,7 +47169,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -49311,15 +47190,205 @@
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "mipseb-n32-generic-full": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "mipseb-n32-generic"
         ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "full",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Full Builds",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "mipseb-n32-generic-full",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "mipseb-n32-generic-tot-chromium-pfq-informational": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "mipseb-n32-generic"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Informational Chromium Uprev & Build (public)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "mipseb-n32-generic-tot-chromium-pfq-informational",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": true,
+        "use_sdk": true,
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan-chromium-pfq": {
+    "mipseb-n64-generic-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -49331,7 +47400,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan"
+            "mipseb-n64-generic"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -49377,7 +47446,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan-chromium-pfq",
+        "name": "mipseb-n64-generic-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -49414,7 +47483,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan-full": {
+    "mipseb-n64-generic-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -49426,7 +47495,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan"
+            "mipseb-n64-generic"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -49474,7 +47543,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "nyan-full",
+        "name": "mipseb-n64-generic-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -49511,418 +47580,29 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan-full-group": {
+    "mipseb-n64-generic-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan"
+            "mipseb-n64-generic"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "nyan"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "nyan-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "nyan_big"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "nyan_big-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "nyan_blaze"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "nyan_blaze-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "nyan_kitty"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "nyan_kitty-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "build_type": "chrome",
+        "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -49932,7 +47612,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds; Group config (boards: nyan, nyan_big, nyan_blaze, nyan_kitty)",
+        "description": "Informational Chromium Uprev & Build (public)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -49940,18 +47620,16 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": false,
@@ -49960,7 +47638,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "nyan-full-group",
+        "name": "mipseb-n64-generic-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -49970,7 +47648,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -49981,23 +47659,23 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
         "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan-paladin": {
+    "mipseb-o32-generic-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -50007,20 +47685,20 @@
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
-        "board_replace": true,
+        "board_replace": false,
         "boards": [
-            "nyan"
+            "mipseb-o32-generic"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "chrome",
         "child_configs": [],
-        "chrome_binhost_only": true,
-        "chrome_rev": null,
+        "chrome_binhost_only": false,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
@@ -50029,7 +47707,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue (internal)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -50048,24 +47726,24 @@
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan-paladin",
+        "name": "mipseb-o32-generic-chromium-pfq",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "nyan paladin",
+        "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -50076,57 +47754,55 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan-payloads": {
+    "mipseb-o32-generic-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan"
+            "mipseb-o32-generic"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "payloads",
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": false,
+        "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Regenerate release payloads.",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -50134,35 +47810,37 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "nyan-payloads",
-        "overlays": "both",
+        "name": "mipseb-o32-generic-full",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -50172,11 +47850,11 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
+        "tests_supported": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": false,
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": true,
@@ -50184,45 +47862,45 @@
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan-release": {
+    "mipseb-o32-generic-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan"
+            "mipseb-o32-generic"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
+        "description": "Informational Chromium Uprev & Build (public)",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -50234,31 +47912,24 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "nyan-release",
-        "overlays": "both",
+        "name": "mipseb-o32-generic-tot-chromium-pfq-informational",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -50266,286 +47937,64 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi",
-            "highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan-release-afdo": {
+    "mipsel-n32-generic-chromium-pfq": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan"
+            "mipsel-n32-generic"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": true,
-                "afdo_update_ebuild": true,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "nyan"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "nyan-release-afdo-generate",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": false,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "nyan"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "nyan-release-afdo-use",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": false,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "build_type": "chrome",
+        "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -50558,29 +48007,20 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan-release-afdo",
+        "name": "mipsel-n32-generic-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -50590,7 +48030,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -50598,7 +48038,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
         "trybot_list": false,
@@ -50606,54 +48046,50 @@
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan-release-afdo-generate": {
+    "mipsel-n32-generic-full": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan"
+            "mipsel-n32-generic"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -50661,20 +48097,13 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
+        "hw_tests": [],
+        "hwqual": false,
         "image_test": true,
         "images": [
             "base",
@@ -50682,14 +48111,14 @@
             "factory_install"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "nyan-release-afdo-generate",
-        "overlays": "both",
+        "name": "mipsel-n32-generic-full",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -50698,7 +48127,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -50706,62 +48135,58 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
+        "useflags": [],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan-release-afdo-use": {
+    "mipsel-n32-generic-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan"
+            "mipsel-n32-generic"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Informational Chromium Uprev & Build (public)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -50774,30 +48199,21 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "nyan-release-afdo-use",
-        "overlays": "both",
+        "name": "mipsel-n32-generic-tot-chromium-pfq-informational",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -50814,7 +48230,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
         "trybot_list": false,
@@ -50822,483 +48238,51 @@
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan-release-group": {
+    "mipsel-n64-generic-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan"
+            "mipsel-n64-generic"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "nyan"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "nyan-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi",
-                    "highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "nyan_big"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "nyan_big-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi",
-                    "highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "nyan_blaze"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "nyan_blaze-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi",
-                    "highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "nyan_kitty"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "nyan_kitty-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "build_type": "chrome",
+        "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal); Group config (boards: nyan, nyan_big, nyan_blaze, nyan_kitty)",
-        "dev_installer_prebuilts": true,
+        "description": "Preflight Chromium Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -51310,101 +48294,89 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan-release-group",
+        "name": "mipsel-n64-generic-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi",
-            "highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan-tot-chrome-pfq-informational": {
+    "mipsel-n64-generic-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan"
+            "mipsel-n64-generic"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chrome Uprev & Build (internal)",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -51412,26 +48384,28 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "nyan-tot-chrome-pfq-informational",
-        "overlays": "both",
+        "name": "mipsel-n64-generic-full",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -51440,7 +48414,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -51451,25 +48425,23 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan-tot-chromium-pfq-informational": {
+    "mipsel-n64-generic-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -51481,7 +48453,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan"
+            "mipsel-n64-generic"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -51527,7 +48499,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "nyan-tot-chromium-pfq-informational",
+        "name": "mipsel-n64-generic-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -51564,7 +48536,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_big-chrome-pfq": {
+    "mipsel-o32-generic-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -51576,7 +48548,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_big"
+            "mipsel-o32-generic"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -51589,14 +48561,14 @@
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -51622,7 +48594,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_big-chrome-pfq",
+        "name": "mipsel-o32-generic-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -51632,7 +48604,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -51653,37 +48625,35 @@
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_big-chromium-pfq": {
+    "mipsel-o32-generic-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_big"
+            "mipsel-o32-generic"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
+        "build_tests": false,
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -51693,43 +48663,48 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "dev"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "nyan_big-chromium-pfq",
-        "overlays": "both",
-        "packages": [],
+        "name": "mipsel-o32-generic-full",
+        "overlays": "public",
+        "packages": [
+            "virtual/target-os",
+            "virtual/target-os-dev",
+            "chromeos-base/chromeos-initramfs"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
+        "paygen_skip_testing": true,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -51738,48 +48713,48 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
+        "sync_chrome": false,
         "tests_supported": false,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_big-full": {
+    "mipsel-o32-generic-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_big"
+            "mipsel-o32-generic"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "full",
+        "build_tests": false,
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
@@ -51788,15 +48763,15 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
+        "description": "Commit Queue",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
@@ -51806,23 +48781,26 @@
         "image_test": true,
         "images": [
             "base",
-            "test",
-            "factory_install"
+            "dev"
         ],
         "important": false,
         "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "nyan_big-full",
+        "name": "mipsel-o32-generic-paladin",
         "overlays": "public",
-        "packages": [],
-        "paladin_builder_name": null,
+        "packages": [
+            "virtual/target-os",
+            "virtual/target-os-dev",
+            "chromeos-base/chromeos-initramfs"
+        ],
+        "paladin_builder_name": "mipsel-o32-generic paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
+        "paygen_skip_testing": true,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
@@ -51835,25 +48813,25 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
+        "sync_chrome": false,
         "tests_supported": false,
         "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
-        "usepkg_build_packages": false,
+        "usepkg_build_packages": true,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_big-payloads": {
+    "mipsel-o32-generic-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -51865,7 +48843,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_big"
+            "mipsel-o32-generic"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -51911,7 +48889,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_big-payloads",
+        "name": "mipsel-o32-generic-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -51948,11 +48926,11 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_big-release": {
+    "mipsel-o32-generic-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -51960,17 +48938,17 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "nyan_big"
+            "mipsel-o32-generic"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
+        "build_tests": false,
         "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -51986,25 +48964,19 @@
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": true,
         "image_test": true,
         "images": [
             "base",
-            "test",
-            "factory_install"
+            "dev"
         ],
         "important": false,
         "internal": true,
@@ -52013,13 +48985,17 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_big-release",
+        "name": "mipsel-o32-generic-release",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/target-os",
+            "virtual/target-os-dev",
+            "chromeos-base/chromeos-initramfs"
+        ],
         "paladin_builder_name": null,
         "paygen": true,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
+        "paygen_skip_delta_payloads": true,
+        "paygen_skip_testing": true,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
@@ -52031,12 +49007,12 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": false,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -52047,264 +49023,46 @@
         "useflags": [
             "chrome_internal",
             "-cros-debug",
-            "-highdpi",
-            "highdpi"
+            "-highdpi"
         ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_big-release-afdo": {
+    "mipsel-o32-generic-tot-chromium-pfq-informational": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_big"
+            "mipsel-o32-generic"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": true,
-                "afdo_update_ebuild": true,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "nyan_big"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "nyan_big-release-afdo-generate",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": false,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "nyan_big"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "nyan_big-release-afdo-use",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": false,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "build_type": "chrome",
+        "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Informational Chromium Uprev & Build (public)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -52317,30 +49075,21 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "nyan_big-release-afdo",
-        "overlays": "both",
+        "name": "mipsel-o32-generic-tot-chromium-pfq-informational",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -52357,7 +49106,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
         "trybot_list": false,
@@ -52365,43 +49114,39 @@
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_big-release-afdo-generate": {
+    "monroe-chrome-pfq": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_big"
+            "monroe"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -52412,223 +49157,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "nyan_big-release-afdo-generate",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "nyan_big-release-afdo-use": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": true,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "nyan_big"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "nyan_big-release-afdo-use",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "nyan_big-tot-chrome-pfq-informational": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "nyan_big"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Informational Chrome Uprev & Build (internal)",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -52652,9 +49181,9 @@
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "nyan_big-tot-chrome-pfq-informational",
+        "name": "monroe-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -52664,7 +49193,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -52674,16 +49203,16 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
             "chrome_internal"
@@ -52691,9 +49220,11 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "nyan_big-tot-chromium-pfq-informational": {
+    "monroe-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -52705,7 +49236,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_big"
+            "monroe"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -52714,8 +49245,8 @@
         "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
@@ -52725,7 +49256,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -52745,14 +49276,14 @@
             "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "nyan_big-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "name": "monroe-chromium-pfq",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -52761,7 +49292,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -52771,46 +49302,48 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "nyan_blaze-chrome-pfq": {
+    "monroe-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "nyan_blaze"
+            "monroe"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
+        "build_tests": false,
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -52820,13 +49353,13 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Firmware Canary",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -52834,11 +49367,9 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": false,
+        "hwqual": true,
         "image_test": false,
-        "images": [
-            "test"
-        ],
+        "images": [],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
@@ -52846,9 +49377,11 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_blaze-chrome-pfq",
+        "name": "monroe-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -52856,57 +49389,59 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": false,
+        "sync_chrome": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
-        "upload_hw_test_artifacts": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_blaze-chromium-pfq": {
+    "monroe-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_blaze"
+            "monroe"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -52917,7 +49452,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -52925,26 +49460,28 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "nyan_blaze-chromium-pfq",
-        "overlays": "both",
+        "name": "monroe-full",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -52963,47 +49500,49 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
+        "tests_supported": true,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "nyan_blaze-full": {
+    "monroe-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_blaze"
+            "monroe"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
@@ -53012,7 +49551,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
+        "description": "Commit Queue (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -53020,37 +49559,35 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
-        "important": false,
-        "internal": false,
+        "important": true,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "nyan_blaze-full",
-        "overlays": "public",
+        "name": "monroe-paladin",
+        "overlays": "both",
         "packages": [],
-        "paladin_builder_name": null,
+        "paladin_builder_name": "monroe paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -53060,24 +49597,26 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_blaze-payloads": {
+    "monroe-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -53089,7 +49628,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_blaze"
+            "monroe"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -53135,7 +49674,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_blaze-payloads",
+        "name": "monroe-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -53172,7 +49711,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_blaze-release": {
+    "monroe-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -53184,7 +49723,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "nyan_blaze"
+            "monroe"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -53237,7 +49776,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_blaze-release",
+        "name": "monroe-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -53257,10 +49796,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -53271,15 +49810,18 @@
         "useflags": [
             "chrome_internal",
             "-cros-debug",
-            "-highdpi",
-            "highdpi"
+            "-highdpi"
         ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "nyan_blaze-release-afdo": {
+    "monroe-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -53291,7 +49833,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "nyan_blaze"
+            "monroe"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -53311,7 +49853,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "nyan_blaze"
+                    "monroe"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -53366,7 +49908,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "nyan_blaze-release-afdo-generate",
+                "name": "monroe-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -53386,10 +49928,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": false,
+                "tests_supported": true,
                 "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": false,
+                "unittests": true,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -53405,7 +49947,11 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": []
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
             },
             {
                 "afdo_generate": false,
@@ -53419,7 +49965,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "nyan_blaze"
+                    "monroe"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -53474,7 +50020,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "nyan_blaze-release-afdo-use",
+                "name": "monroe-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -53494,10 +50040,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": false,
+                "tests_supported": true,
                 "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": false,
+                "unittests": true,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -53513,7 +50059,11 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": []
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
             }
         ],
         "chrome_binhost_only": false,
@@ -53563,7 +50113,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_blaze-release-afdo",
+        "name": "monroe-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -53583,10 +50133,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -53602,9 +50152,13 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "nyan_blaze-release-afdo-generate": {
+    "monroe-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -53616,7 +50170,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "nyan_blaze"
+            "monroe"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -53671,7 +50225,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_blaze-release-afdo-generate",
+        "name": "monroe-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -53691,10 +50245,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -53710,9 +50264,13 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "nyan_blaze-release-afdo-use": {
+    "monroe-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -53724,7 +50282,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "nyan_blaze"
+            "monroe"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -53779,7 +50337,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_blaze-release-afdo-use",
+        "name": "monroe-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -53799,10 +50357,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -53818,9 +50376,13 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "nyan_blaze-tot-chrome-pfq-informational": {
+    "monroe-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -53832,7 +50394,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_blaze"
+            "monroe"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -53878,7 +50440,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "nyan_blaze-tot-chrome-pfq-informational",
+        "name": "monroe-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -53898,10 +50460,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -53915,9 +50477,11 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite"
+        ]
     },
-    "nyan_blaze-tot-chromium-pfq-informational": {
+    "monroe-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -53929,7 +50493,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_blaze"
+            "monroe"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -53975,7 +50539,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "nyan_blaze-tot-chromium-pfq-informational",
+        "name": "monroe-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -53995,10 +50559,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -54010,9 +50574,11 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite"
+        ]
     },
-    "nyan_freon-chrome-pfq": {
+    "nyan-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -54024,7 +50590,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_freon"
+            "nyan"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -54070,7 +50636,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_freon-chrome-pfq",
+        "name": "nyan-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -54109,7 +50675,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_freon-chromium-pfq": {
+    "nyan-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -54121,7 +50687,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_freon"
+            "nyan"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -54167,7 +50733,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_freon-chromium-pfq",
+        "name": "nyan-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -54204,7 +50770,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_freon-full": {
+    "nyan-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -54216,7 +50782,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_freon"
+            "nyan"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -54264,7 +50830,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "nyan_freon-full",
+        "name": "nyan-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -54301,357 +50867,59 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_freon-paladin": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "nyan_freon"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "paladin",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Commit Queue (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "nyan_freon-paladin",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": "nyan_freon paladin",
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "private",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "nyan_freon-payloads": {
+    "nyan-full-group": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_freon"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "payloads",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Regenerate release payloads.",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "nyan_freon-payloads",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "nyan_freon-release": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": true,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "nyan_freon"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "nyan_freon-release",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "nyan_freon-release-afdo": {
-        "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "nyan_freon"
+            "nyan"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "full",
         "child_configs": [
             {
                 "afdo_generate": false,
-                "afdo_generate_min": true,
-                "afdo_update_ebuild": true,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
                 "afdo_use": false,
                 "archive": true,
                 "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
                 "board_replace": false,
                 "boards": [
-                    "nyan_freon"
+                    "nyan"
                 ],
                 "branch": false,
                 "build_before_patching": false,
                 "build_packages_in_background": false,
                 "build_tests": true,
-                "build_type": "canary",
+                "build_type": "full",
                 "child_configs": [],
                 "chrome_binhost_only": false,
                 "chrome_rev": null,
                 "chrome_sdk": true,
                 "chrome_sdk_build_chrome": true,
                 "chrome_sdk_goma": false,
-                "chromeos_official": true,
+                "chromeos_official": false,
                 "chroot_replace": true,
                 "compilecheck": false,
                 "cpe_export": true,
                 "create_delta_sysroot": false,
                 "critical_for_chrome": false,
                 "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
+                "description": "Full Builds",
                 "dev_installer_prebuilts": false,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
@@ -54659,20 +50927,13 @@
                 "factory_install_netboot": true,
                 "factory_toolkit": true,
                 "gcc_githash": null,
-                "git_sync": false,
+                "git_sync": true,
                 "grouped": true,
                 "gs_path": "default",
                 "health_alert_recipients": [],
                 "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
+                "hw_tests": [],
+                "hwqual": false,
                 "image_test": true,
                 "images": [
                     "base",
@@ -54680,14 +50941,14 @@
                     "factory_install"
                 ],
                 "important": false,
-                "internal": true,
+                "internal": false,
                 "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
                 "master": false,
-                "name": "nyan_freon-release-afdo-generate",
-                "overlays": "both",
+                "name": "nyan-full",
+                "overlays": "public",
                 "packages": [],
                 "paladin_builder_name": null,
                 "paygen": false,
@@ -54696,7 +50957,7 @@
                 "postsync_patch": true,
                 "postsync_reexec": true,
                 "pre_cq": false,
-                "prebuilts": false,
+                "prebuilts": "public",
                 "profile": null,
                 "push_image": false,
                 "push_overlays": null,
@@ -54704,24 +50965,20 @@
                 "rootfs_verification": true,
                 "sanity_check_slaves": null,
                 "shared_user_password": null,
-                "signer_tests": true,
+                "signer_tests": false,
                 "sync_chrome": null,
                 "tests_supported": false,
-                "trybot_list": false,
+                "trybot_list": true,
                 "unittest_blacklist": [],
                 "unittests": false,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
-                "upload_symbols": true,
+                "upload_symbols": false,
                 "uprev": true,
                 "use_chrome_lkgm": false,
                 "use_lkgm": false,
                 "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
+                "useflags": [],
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
@@ -54731,35 +50988,35 @@
                 "afdo_generate": false,
                 "afdo_generate_min": false,
                 "afdo_update_ebuild": false,
-                "afdo_use": true,
+                "afdo_use": false,
                 "archive": true,
                 "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
                 "board_replace": false,
                 "boards": [
-                    "nyan_freon"
+                    "nyan_big"
                 ],
                 "branch": false,
                 "build_before_patching": false,
-                "build_packages_in_background": false,
+                "build_packages_in_background": true,
                 "build_tests": true,
-                "build_type": "canary",
+                "build_type": "full",
                 "child_configs": [],
                 "chrome_binhost_only": false,
                 "chrome_rev": null,
                 "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_build_chrome": false,
                 "chrome_sdk_goma": false,
-                "chromeos_official": true,
+                "chromeos_official": false,
                 "chroot_replace": true,
                 "compilecheck": false,
                 "cpe_export": true,
                 "create_delta_sysroot": false,
                 "critical_for_chrome": false,
                 "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
+                "description": "Full Builds",
                 "dev_installer_prebuilts": false,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
@@ -54767,20 +51024,13 @@
                 "factory_install_netboot": true,
                 "factory_toolkit": true,
                 "gcc_githash": null,
-                "git_sync": false,
+                "git_sync": true,
                 "grouped": true,
                 "gs_path": "default",
                 "health_alert_recipients": [],
                 "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
+                "hw_tests": [],
+                "hwqual": false,
                 "image_test": true,
                 "images": [
                     "base",
@@ -54788,14 +51038,14 @@
                     "factory_install"
                 ],
                 "important": false,
-                "internal": true,
+                "internal": false,
                 "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
                 "master": false,
-                "name": "nyan_freon-release-afdo-use",
-                "overlays": "both",
+                "name": "nyan_big-full",
+                "overlays": "public",
                 "packages": [],
                 "paladin_builder_name": null,
                 "paygen": false,
@@ -54804,7 +51054,7 @@
                 "postsync_patch": true,
                 "postsync_reexec": true,
                 "pre_cq": false,
-                "prebuilts": false,
+                "prebuilts": "public",
                 "profile": null,
                 "push_image": false,
                 "push_overlays": null,
@@ -54812,24 +51062,214 @@
                 "rootfs_verification": true,
                 "sanity_check_slaves": null,
                 "shared_user_password": null,
-                "signer_tests": true,
+                "signer_tests": false,
                 "sync_chrome": null,
                 "tests_supported": false,
-                "trybot_list": false,
+                "trybot_list": true,
                 "unittest_blacklist": [],
-                "unittests": false,
+                "unittests": null,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
-                "upload_symbols": true,
+                "upload_symbols": false,
                 "uprev": true,
                 "use_chrome_lkgm": false,
                 "use_lkgm": false,
                 "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "nyan_blaze"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "nyan_blaze-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "nyan_kitty"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
                 ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "nyan_kitty-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
@@ -54841,14 +51281,14 @@
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Full Builds; Group config (boards: nyan, nyan_big, nyan_blaze, nyan_kitty)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -54856,20 +51296,13 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
+        "hw_tests": [],
+        "hwqual": false,
         "image_test": true,
         "images": [
             "base",
@@ -54877,14 +51310,14 @@
             "factory_install"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "nyan_freon-release-afdo",
-        "overlays": "both",
+        "name": "nyan-full-group",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -54893,7 +51326,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -54901,62 +51334,58 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
+        "useflags": [],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_freon-release-afdo-generate": {
+    "nyan-paladin": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": true,
         "boards": [
-            "nyan_freon"
+            "nyan"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "paladin",
         "child_configs": [],
-        "chrome_binhost_only": false,
+        "chrome_binhost_only": true,
         "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Commit Queue (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -54969,39 +51398,30 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_freon-release-afdo-generate",
+        "name": "nyan-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": null,
+        "paladin_builder_name": "nyan paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -55009,62 +51429,60 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
+            "chrome_internal"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_freon-release-afdo-use": {
+    "nyan-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_freon"
+            "nyan"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
+        "chromeos_official": false,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -55077,33 +51495,24 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_freon-release-afdo-use",
+        "name": "nyan-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -55117,52 +51526,48 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
+        "unittests": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_freon-tot-chrome-pfq-informational": {
+    "nyan-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "nyan_freon"
+            "nyan"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -55172,8 +51577,8 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chrome Uprev & Build (internal)",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -55185,24 +51590,31 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "nyan_freon-tot-chrome-pfq-informational",
+        "name": "nyan-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -55210,150 +51622,275 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi",
+            "highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_freon-tot-chromium-pfq-informational": {
+    "nyan-release-afdo": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "nyan_freon"
+            "nyan"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": false,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
-        "master": false,
-        "name": "nyan_freon-tot-chromium-pfq-informational",
-        "overlays": "public",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
-        "use_chrome_lkgm": false,
-        "use_lkgm": true,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "nyan_kitty-chrome-pfq": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "nyan_kitty"
+        "build_type": "canary",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": true,
+                "afdo_update_ebuild": true,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "nyan"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "nyan-release-afdo-generate",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "nyan"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "nyan-release-afdo-use",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
         ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
-        "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -55364,7 +51901,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -55377,20 +51914,29 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_kitty-chrome-pfq",
+        "name": "nyan-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -55400,7 +51946,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -55408,7 +51954,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": false,
         "trybot_list": false,
@@ -55416,52 +51962,54 @@
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_kitty-chromium-pfq": {
+    "nyan-release-afdo-generate": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "nyan_kitty"
+            "nyan"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -55474,20 +52022,29 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_kitty-chromium-pfq",
+        "name": "nyan-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -55497,7 +52054,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -55505,7 +52062,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": false,
         "trybot_list": false,
@@ -55513,50 +52070,54 @@
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_kitty-full": {
+    "nyan-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "nyan_kitty"
+            "nyan"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -55564,13 +52125,20 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
         "image_test": true,
         "images": [
             "base",
@@ -55578,14 +52146,14 @@
             "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "nyan_kitty-full",
-        "overlays": "public",
+        "name": "nyan-release-afdo-use",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -55594,7 +52162,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -55602,239 +52170,42 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_kitty-payloads": {
+    "nyan-release-group": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "nyan_kitty"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "payloads",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Regenerate release payloads.",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "nyan_kitty-payloads",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "nyan_kitty-release": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": true,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "nyan_kitty"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "nyan_kitty-release",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": true,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "nyan_kitty-release-afdo": {
-        "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "nyan_kitty"
+            "nyan"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -55844,9 +52215,9 @@
         "child_configs": [
             {
                 "afdo_generate": false,
-                "afdo_generate_min": true,
-                "afdo_update_ebuild": true,
-                "afdo_use": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
                 "archive": true,
                 "archive_build_debug": true,
                 "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -55854,7 +52225,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "nyan_kitty"
+                    "nyan"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -55875,7 +52246,7 @@
                 "critical_for_chrome": false,
                 "debug_symbols": true,
                 "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
+                "dev_installer_prebuilts": true,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
                 "do_not_apply_cq_patches": false,
@@ -55888,12 +52259,10 @@
                 "health_alert_recipients": [],
                 "health_threshold": 0,
                 "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
                 ],
                 "hwqual": true,
                 "image_test": true,
@@ -55909,11 +52278,11 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "nyan_kitty-release-afdo-generate",
+                "name": "nyan-release",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
-                "paygen": false,
+                "paygen": true,
                 "paygen_skip_delta_payloads": false,
                 "paygen_skip_testing": false,
                 "postsync_patch": true,
@@ -55921,7 +52290,7 @@
                 "pre_cq": false,
                 "prebuilts": false,
                 "profile": null,
-                "push_image": false,
+                "push_image": true,
                 "push_overlays": null,
                 "quick_unit": false,
                 "rootfs_verification": true,
@@ -55930,7 +52299,7 @@
                 "signer_tests": true,
                 "sync_chrome": null,
                 "tests_supported": false,
-                "trybot_list": false,
+                "trybot_list": true,
                 "unittest_blacklist": [],
                 "unittests": false,
                 "upload_hw_test_artifacts": true,
@@ -55943,7 +52312,222 @@
                 "useflags": [
                     "chrome_internal",
                     "-cros-debug",
-                    "-highdpi"
+                    "-highdpi",
+                    "highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "nyan_big"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "nyan_big-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi",
+                    "highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "nyan_blaze"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "nyan_blaze-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi",
+                    "highdpi"
                 ],
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
@@ -55966,14 +52550,14 @@
                 ],
                 "branch": false,
                 "build_before_patching": false,
-                "build_packages_in_background": false,
+                "build_packages_in_background": true,
                 "build_tests": true,
                 "build_type": "canary",
                 "child_configs": [],
                 "chrome_binhost_only": false,
                 "chrome_rev": null,
                 "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_build_chrome": false,
                 "chrome_sdk_goma": false,
                 "chromeos_official": true,
                 "chroot_replace": true,
@@ -55983,7 +52567,7 @@
                 "critical_for_chrome": false,
                 "debug_symbols": true,
                 "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
+                "dev_installer_prebuilts": true,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
                 "do_not_apply_cq_patches": false,
@@ -55996,12 +52580,10 @@
                 "health_alert_recipients": [],
                 "health_threshold": 0,
                 "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
                 ],
                 "hwqual": true,
                 "image_test": true,
@@ -56017,11 +52599,11 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "nyan_kitty-release-afdo-use",
+                "name": "nyan_kitty-release",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
-                "paygen": false,
+                "paygen": true,
                 "paygen_skip_delta_payloads": false,
                 "paygen_skip_testing": false,
                 "postsync_patch": true,
@@ -56029,7 +52611,7 @@
                 "pre_cq": false,
                 "prebuilts": false,
                 "profile": null,
-                "push_image": false,
+                "push_image": true,
                 "push_overlays": null,
                 "quick_unit": false,
                 "rootfs_verification": true,
@@ -56038,9 +52620,9 @@
                 "signer_tests": true,
                 "sync_chrome": null,
                 "tests_supported": false,
-                "trybot_list": false,
+                "trybot_list": true,
                 "unittest_blacklist": [],
-                "unittests": false,
+                "unittests": null,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -56071,8 +52653,8 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal); Group config (boards: nyan, nyan_big, nyan_blaze, nyan_kitty)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -56085,12 +52667,10 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
         ],
         "hwqual": true,
         "image_test": true,
@@ -56099,18 +52679,18 @@
             "test",
             "factory_install"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "nyan_kitty-release-afdo",
+        "name": "nyan-release-group",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -56118,7 +52698,7 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
@@ -56127,7 +52707,7 @@
         "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": false,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
@@ -56140,36 +52720,37 @@
         "useflags": [
             "chrome_internal",
             "-cros-debug",
-            "-highdpi"
+            "-highdpi",
+            "highdpi"
         ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_kitty-release-afdo-generate": {
+    "nyan-tot-chrome-pfq-informational": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_kitty"
+            "nyan"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -56179,7 +52760,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Informational Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -56192,29 +52773,20 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_version": false,
         "master": false,
-        "name": "nyan_kitty-release-afdo-generate",
+        "name": "nyan-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -56232,7 +52804,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": false,
         "trybot_list": false,
@@ -56240,259 +52812,52 @@
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
+            "chrome_internal"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "nyan_kitty-release-afdo-use": {
+    "nyan-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "nyan_kitty"
+            "nyan"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "nyan_kitty-release-afdo-use",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "nyan_kitty-tot-chrome-pfq-informational": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "nyan_kitty"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Informational Chrome Uprev & Build (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
-        "master": false,
-        "name": "nyan_kitty-tot-chrome-pfq-informational",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
-        "use_chrome_lkgm": false,
-        "use_lkgm": true,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "nyan_kitty-tot-chromium-pfq-informational": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "nyan_kitty"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Informational Chromium Uprev & Build (public)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -56518,7 +52883,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "nyan_kitty-tot-chromium-pfq-informational",
+        "name": "nyan-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -56555,7 +52920,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "panther-chrome-pfq": {
+    "nyan_big-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -56567,7 +52932,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "panther"
+            "nyan_big"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -56613,7 +52978,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "panther-chrome-pfq",
+        "name": "nyan_big-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -56633,10 +52998,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -56650,11 +53015,9 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "panther-chromium-pfq": {
+    "nyan_big-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -56666,7 +53029,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "panther"
+            "nyan_big"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -56712,7 +53075,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "panther-chromium-pfq",
+        "name": "nyan_big-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -56732,10 +53095,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -56747,110 +53110,9 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
-    },
-    "panther-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "panther"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Canary",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "panther-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
         "vm_tests": []
     },
-    "panther-full": {
+    "nyan_big-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -56862,7 +53124,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "panther"
+            "nyan_big"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -56910,7 +53172,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "panther-full",
+        "name": "nyan_big-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -56930,10 +53192,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -56945,108 +53207,9 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
-    },
-    "panther-paladin": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "panther"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "paladin",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Commit Queue (internal)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": true,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "panther-paladin",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": "panther paladin",
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "private",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
         "vm_tests": []
     },
-    "panther-payloads": {
+    "nyan_big-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -57058,7 +53221,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "panther"
+            "nyan_big"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -57104,7 +53267,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "panther-payloads",
+        "name": "nyan_big-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -57141,7 +53304,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "panther-release": {
+    "nyan_big-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -57153,7 +53316,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "panther"
+            "nyan_big"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -57206,7 +53369,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "panther-release",
+        "name": "nyan_big-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -57226,10 +53389,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -57240,18 +53403,15 @@
         "useflags": [
             "chrome_internal",
             "-cros-debug",
-            "-highdpi"
+            "-highdpi",
+            "highdpi"
         ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "panther-release-afdo": {
+    "nyan_big-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -57263,7 +53423,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "panther"
+            "nyan_big"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -57283,7 +53443,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "panther"
+                    "nyan_big"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -57338,7 +53498,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "panther-release-afdo-generate",
+                "name": "nyan_big-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -57358,10 +53518,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": true,
+                "tests_supported": false,
                 "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": true,
+                "unittests": false,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -57377,11 +53537,7 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
+                "vm_tests": []
             },
             {
                 "afdo_generate": false,
@@ -57395,7 +53551,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "panther"
+                    "nyan_big"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -57450,7 +53606,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "panther-release-afdo-use",
+                "name": "nyan_big-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -57470,10 +53626,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": true,
+                "tests_supported": false,
                 "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": true,
+                "unittests": false,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -57489,11 +53645,7 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
+                "vm_tests": []
             }
         ],
         "chrome_binhost_only": false,
@@ -57543,7 +53695,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "panther-release-afdo",
+        "name": "nyan_big-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -57563,10 +53715,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -57582,13 +53734,9 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "panther-release-afdo-generate": {
+    "nyan_big-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -57600,7 +53748,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "panther"
+            "nyan_big"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -57655,7 +53803,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "panther-release-afdo-generate",
+        "name": "nyan_big-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -57675,10 +53823,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -57694,13 +53842,9 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "panther-release-afdo-use": {
+    "nyan_big-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -57712,7 +53856,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "panther"
+            "nyan_big"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -57767,7 +53911,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "panther-release-afdo-use",
+        "name": "nyan_big-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -57787,10 +53931,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -57806,108 +53950,9 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
-    },
-    "panther-test-ap": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "panther"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "pfq",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "WiFi AP images used in testing",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [
-            "test"
-        ],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
-        "master": false,
-        "name": "panther-test-ap",
-        "overlays": "both",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": "testbed-ap",
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
         "vm_tests": []
     },
-    "panther-tot-chrome-pfq-informational": {
+    "nyan_big-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -57919,7 +53964,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "panther"
+            "nyan_big"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -57965,7 +54010,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "panther-tot-chrome-pfq-informational",
+        "name": "nyan_big-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -57985,10 +54030,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -58002,11 +54047,9 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "panther-tot-chromium-pfq-informational": {
+    "nyan_big-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -58018,7 +54061,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "panther"
+            "nyan_big"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -58064,7 +54107,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "panther-tot-chromium-pfq-informational",
+        "name": "nyan_big-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -58084,10 +54127,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -58099,11 +54142,9 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "panther_embedded-minimal-paladin": {
+    "nyan_blaze-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -58115,27 +54156,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "panther_embedded"
+            "nyan_blaze"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -58155,24 +54196,24 @@
             "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "panther_embedded-minimal-paladin",
-        "overlays": "public",
+        "name": "nyan_blaze-chrome-pfq",
+        "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "panther_embedded-minimal paladin",
+        "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
-        "profile": "minimal",
+        "prebuilts": "private",
+        "profile": null,
         "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
@@ -58180,57 +54221,59 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": true,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "panther_embedded-minimal-release": {
+    "nyan_blaze-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "panther_embedded"
+            "nyan_blaze"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -58244,21 +54287,19 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": true,
-        "image_test": true,
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "panther_embedded-minimal-release",
+        "name": "nyan_blaze-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -58268,70 +54309,66 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
-        "profile": "minimal",
-        "push_image": true,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": true,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "parrot-chrome-perf": {
+    "nyan_blaze-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_blaze"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Chrome Performance test bot",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -58339,28 +54376,28 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": true,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 5400,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "parrot-chrome-perf",
-        "overlays": "both",
+        "name": "nyan_blaze-full",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -58369,7 +54406,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -58379,27 +54416,24 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
-        "use_chrome_lkgm": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "parrot-chrome-pfq": {
+    "nyan_blaze-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -58411,27 +54445,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_blaze"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
+        "chromeos_official": false,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -58457,17 +54491,17 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot-chrome-pfq",
+        "name": "nyan_blaze-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -58481,57 +54515,53 @@
         "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "parrot-chromium-pfq": {
+    "nyan_blaze-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_blaze"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -58543,62 +54573,72 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot-chromium-pfq",
+        "name": "nyan_blaze-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
+        "tests_supported": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi",
+            "highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "parrot-firmware": {
+    "nyan_blaze-release-afdo": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
@@ -58607,17 +54647,234 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_blaze"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
+        "build_tests": true,
         "build_type": "canary",
-        "child_configs": [],
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": true,
+                "afdo_update_ebuild": true,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "nyan_blaze"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "nyan_blaze-release-afdo-generate",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "nyan_blaze"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "nyan_blaze-release-afdo-use",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -58627,35 +54884,44 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Canary",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": true,
-        "image_test": false,
-        "images": [],
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot-firmware",
+        "name": "nyan_blaze-release-afdo",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -58665,21 +54931,21 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
@@ -58689,44 +54955,44 @@
             "-cros-debug",
             "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "parrot-full": {
+    "nyan_blaze-release-afdo-generate": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_blaze"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -58734,13 +55000,20 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
         "image_test": true,
         "images": [
             "base",
@@ -58748,14 +55021,14 @@
             "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "parrot-full",
-        "overlays": "public",
+        "name": "nyan_blaze-release-afdo-generate",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -58764,7 +55037,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -58772,60 +55045,62 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "parrot-paladin": {
+    "nyan_blaze-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_blaze"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue (internal)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -58839,32 +55114,38 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
         ],
-        "hwqual": false,
-        "image_test": false,
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot-paladin",
+        "name": "nyan_blaze-release-afdo-use",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "parrot paladin",
+        "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -58872,28 +55153,30 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
-        "upload_symbols": false,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "parrot-payloads": {
+    "nyan_blaze-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -58905,27 +55188,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_blaze"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "payloads",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "tot",
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Regenerate release payloads.",
+        "description": "Informational Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -58949,13 +55232,13 @@
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_version": false,
         "master": false,
-        "name": "parrot-payloads",
+        "name": "nyan_blaze-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -58971,56 +55254,58 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": false,
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "parrot-pre-cq": {
+    "nyan_blaze-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
-        "archive": false,
+        "archive": true,
         "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_blaze"
         ],
         "branch": false,
         "build_before_patching": false,
-        "build_packages_in_background": true,
+        "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "binary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "tot",
         "chrome_sdk": false,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
-        "compilecheck": true,
-        "cpe_export": false,
+        "compilecheck": false,
+        "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
-        "debug_symbols": false,
-        "description": "Verifies compilation only",
+        "debug_symbols": true,
+        "description": "Informational Chromium Uprev & Build (public)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -59039,15 +55324,15 @@
         "images": [
             "test"
         ],
-        "important": true,
-        "internal": true,
+        "important": false,
+        "internal": false,
         "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "parrot-pre-cq",
-        "overlays": "both",
+        "name": "nyan_blaze-tot-chromium-pfq-informational",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -59055,7 +55340,7 @@
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
-        "pre_cq": true,
+        "pre_cq": false,
         "prebuilts": false,
         "profile": null,
         "push_image": false,
@@ -59066,49 +55351,45 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "parrot-release": {
+    "nyan_freon-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_freon"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -59117,10 +55398,10 @@
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
-        "critical_for_chrome": true,
+        "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
+        "description": "Preflight Chrome Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -59132,329 +55413,91 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot-release",
+        "name": "nyan_freon-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
+            "chrome_internal"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "parrot-release-afdo": {
+    "nyan_freon-chromium-pfq": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_freon"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": true,
-                "afdo_update_ebuild": true,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "parrot"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "parrot-release-afdo-generate",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": false,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "parrot"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "parrot-release-afdo-use",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": false,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
-            }
-        ],
+        "build_type": "chrome",
+        "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -59467,29 +55510,20 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot-release-afdo",
+        "name": "nyan_freon-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -59499,7 +55533,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -59507,66 +55541,58 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "parrot-release-afdo-generate": {
+    "nyan_freon-full": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_freon"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -59574,20 +55600,13 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
+        "hw_tests": [],
+        "hwqual": false,
         "image_test": true,
         "images": [
             "base",
@@ -59595,14 +55614,14 @@
             "factory_install"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "parrot-release-afdo-generate",
-        "overlays": "both",
+        "name": "nyan_freon-full",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -59611,7 +55630,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -59619,34 +55638,218 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
+        "tests_supported": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
+        "useflags": [],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "parrot-release-afdo-use": {
+    "nyan_freon-paladin": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "nyan_freon"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "paladin",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Commit Queue (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "nyan_freon-paladin",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": "nyan_freon paladin",
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "nyan_freon-payloads": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "nyan_freon"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "payloads",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": false,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Regenerate release payloads.",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "nyan_freon-payloads",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": true,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "nyan_freon-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -59658,7 +55861,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -59679,7 +55882,7 @@
         "critical_for_chrome": false,
         "debug_symbols": true,
         "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": false,
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -59692,12 +55895,10 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
         ],
         "hwqual": true,
         "image_test": true,
@@ -59713,11 +55914,11 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot-release-afdo-use",
+        "name": "nyan_freon-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -59725,7 +55926,7 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
@@ -59733,10 +55934,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
+        "tests_supported": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -59752,17 +55953,13 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "parrot-release-group": {
+    "nyan_freon-release-afdo": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
+        "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -59770,7 +55967,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -59780,9 +55977,9 @@
         "child_configs": [
             {
                 "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
+                "afdo_generate_min": true,
+                "afdo_update_ebuild": true,
+                "afdo_use": false,
                 "archive": true,
                 "archive_build_debug": true,
                 "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -59790,7 +55987,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "parrot"
+                    "nyan_freon"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -59808,10 +56005,10 @@
                 "compilecheck": false,
                 "cpe_export": true,
                 "create_delta_sysroot": false,
-                "critical_for_chrome": true,
+                "critical_for_chrome": false,
                 "debug_symbols": true,
                 "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
+                "dev_installer_prebuilts": false,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
                 "do_not_apply_cq_patches": false,
@@ -59824,10 +56021,12 @@
                 "health_alert_recipients": [],
                 "health_threshold": 0,
                 "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
                 ],
                 "hwqual": true,
                 "image_test": true,
@@ -59843,11 +56042,11 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "parrot-release",
+                "name": "nyan_freon-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
-                "paygen": true,
+                "paygen": false,
                 "paygen_skip_delta_payloads": false,
                 "paygen_skip_testing": false,
                 "postsync_patch": true,
@@ -59855,7 +56054,7 @@
                 "pre_cq": false,
                 "prebuilts": false,
                 "profile": null,
-                "push_image": true,
+                "push_image": false,
                 "push_overlays": null,
                 "quick_unit": false,
                 "rootfs_verification": true,
@@ -59863,10 +56062,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
+                "tests_supported": false,
+                "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": true,
+                "unittests": false,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -59882,11 +56081,7 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
+                "vm_tests": []
             },
             {
                 "afdo_generate": false,
@@ -59900,18 +56095,18 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "parrot_ivb"
+                    "nyan_freon"
                 ],
                 "branch": false,
                 "build_before_patching": false,
-                "build_packages_in_background": true,
+                "build_packages_in_background": false,
                 "build_tests": true,
                 "build_type": "canary",
                 "child_configs": [],
                 "chrome_binhost_only": false,
                 "chrome_rev": null,
-                "chrome_sdk": false,
-                "chrome_sdk_build_chrome": false,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
                 "chrome_sdk_goma": false,
                 "chromeos_official": true,
                 "chroot_replace": true,
@@ -59921,7 +56116,7 @@
                 "critical_for_chrome": false,
                 "debug_symbols": true,
                 "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
+                "dev_installer_prebuilts": false,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
                 "do_not_apply_cq_patches": false,
@@ -59934,10 +56129,12 @@
                 "health_alert_recipients": [],
                 "health_threshold": 0,
                 "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
                 ],
                 "hwqual": true,
                 "image_test": true,
@@ -59953,11 +56150,11 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "parrot_ivb-release",
+                "name": "nyan_freon-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
-                "paygen": true,
+                "paygen": false,
                 "paygen_skip_delta_payloads": false,
                 "paygen_skip_testing": false,
                 "postsync_patch": true,
@@ -59965,7 +56162,7 @@
                 "pre_cq": false,
                 "prebuilts": false,
                 "profile": null,
-                "push_image": true,
+                "push_image": false,
                 "push_overlays": null,
                 "quick_unit": false,
                 "rootfs_verification": true,
@@ -59973,10 +56170,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
+                "tests_supported": false,
+                "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": null,
+                "unittests": false,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -60005,10 +56202,10 @@
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
-        "critical_for_chrome": true,
+        "critical_for_chrome": false,
         "debug_symbols": true,
         "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -60021,10 +56218,12 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
         ],
         "hwqual": true,
         "image_test": true,
@@ -60040,11 +56239,11 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot-release-group",
+        "name": "nyan_freon-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -60052,7 +56251,7 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
@@ -60060,10 +56259,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -60079,35 +56278,31 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "parrot-tot-chrome-pfq-informational": {
+    "nyan_freon-release-afdo-generate": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_freon"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -60117,7 +56312,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chrome Uprev & Build (internal)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -60130,20 +56325,29 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "parrot-tot-chrome-pfq-informational",
+        "name": "nyan_freon-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -60161,62 +56365,62 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "parrot-tot-chromium-pfq-informational": {
+    "nyan_freon-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "parrot"
+            "nyan_freon"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -60229,21 +56433,30 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "parrot-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "name": "nyan_freon-release-afdo-use",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -60260,28 +56473,30 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "parrot_ivb-chrome-pfq": {
+    "nyan_freon-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -60293,7 +56508,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "parrot_ivb"
+            "nyan_freon"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -60302,8 +56517,8 @@
         "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -60313,7 +56528,199 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Informational Chrome Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": false,
+        "master": false,
+        "name": "nyan_freon-tot-chrome-pfq-informational",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": true,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "nyan_freon-tot-chromium-pfq-informational": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "nyan_freon"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Informational Chromium Uprev & Build (public)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "nyan_freon-tot-chromium-pfq-informational",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": true,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "nyan_kitty-chrome-pfq": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "nyan_kitty"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -60339,7 +56746,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot_ivb-chrome-pfq",
+        "name": "nyan_kitty-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -60359,10 +56766,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -60376,11 +56783,9 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "parrot_ivb-chromium-pfq": {
+    "nyan_kitty-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -60392,7 +56797,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "parrot_ivb"
+            "nyan_kitty"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -60438,7 +56843,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot_ivb-chromium-pfq",
+        "name": "nyan_kitty-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -60458,10 +56863,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -60473,11 +56878,9 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "parrot_ivb-full": {
+    "nyan_kitty-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -60489,7 +56892,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "parrot_ivb"
+            "nyan_kitty"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -60537,7 +56940,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "parrot_ivb-full",
+        "name": "nyan_kitty-full",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -60557,10 +56960,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -60572,11 +56975,9 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "parrot_ivb-payloads": {
+    "nyan_kitty-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -60588,7 +56989,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "parrot_ivb"
+            "nyan_kitty"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -60634,7 +57035,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot_ivb-payloads",
+        "name": "nyan_kitty-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -60671,7 +57072,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "parrot_ivb-release": {
+    "nyan_kitty-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -60683,18 +57084,18 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "parrot_ivb"
+            "nyan_kitty"
         ],
         "branch": false,
         "build_before_patching": false,
-        "build_packages_in_background": true,
+        "build_packages_in_background": false,
         "build_tests": true,
         "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
         "chroot_replace": true,
@@ -60736,7 +57137,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot_ivb-release",
+        "name": "nyan_kitty-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -60756,10 +57157,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": null,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -60777,7 +57178,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "parrot_ivb-release-afdo": {
+    "nyan_kitty-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -60789,7 +57190,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "parrot_ivb"
+            "nyan_kitty"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -60809,7 +57210,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "parrot_ivb"
+                    "nyan_kitty"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -60864,7 +57265,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "parrot_ivb-release-afdo-generate",
+                "name": "nyan_kitty-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -60884,10 +57285,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": true,
+                "tests_supported": false,
                 "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": true,
+                "unittests": false,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -60903,11 +57304,7 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
+                "vm_tests": []
             },
             {
                 "afdo_generate": false,
@@ -60921,7 +57318,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "parrot_ivb"
+                    "nyan_kitty"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -60976,7 +57373,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "parrot_ivb-release-afdo-use",
+                "name": "nyan_kitty-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -60996,10 +57393,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": true,
+                "tests_supported": false,
                 "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": true,
+                "unittests": false,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -61015,11 +57412,7 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
+                "vm_tests": []
             }
         ],
         "chrome_binhost_only": false,
@@ -61069,7 +57462,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot_ivb-release-afdo",
+        "name": "nyan_kitty-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -61089,10 +57482,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -61108,13 +57501,9 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "parrot_ivb-release-afdo-generate": {
+    "nyan_kitty-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -61126,7 +57515,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "parrot_ivb"
+            "nyan_kitty"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -61181,7 +57570,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot_ivb-release-afdo-generate",
+        "name": "nyan_kitty-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -61201,10 +57590,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -61220,13 +57609,9 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "parrot_ivb-release-afdo-use": {
+    "nyan_kitty-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -61238,7 +57623,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "parrot_ivb"
+            "nyan_kitty"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -61293,7 +57678,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "parrot_ivb-release-afdo-use",
+        "name": "nyan_kitty-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -61313,10 +57698,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -61332,13 +57717,9 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "parrot_ivb-tot-chrome-pfq-informational": {
+    "nyan_kitty-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -61350,7 +57731,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "parrot_ivb"
+            "nyan_kitty"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -61396,7 +57777,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "parrot_ivb-tot-chrome-pfq-informational",
+        "name": "nyan_kitty-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -61416,10 +57797,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -61433,11 +57814,9 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "parrot_ivb-tot-chromium-pfq-informational": {
+    "nyan_kitty-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -61449,7 +57828,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "parrot_ivb"
+            "nyan_kitty"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -61495,7 +57874,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "parrot_ivb-tot-chromium-pfq-informational",
+        "name": "nyan_kitty-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -61515,10 +57894,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -61530,227 +57909,129 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "panther-chrome-pfq": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "panther"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Preflight Chrome Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "panther-chrome-pfq",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
         "vm_tests": [
-            "smoke_suite"
+            "pfq_suite"
         ]
     },
-    "peach-full-group": {
+    "panther-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pit"
+            "panther"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "peach_pit"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "peach_pit-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "peach_pi"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "peach_pi-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "build_type": "chrome",
+        "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -61761,7 +58042,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds; Group config (boards: peach_pit, peach_pi)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -61769,28 +58050,26 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "peach-full-group",
-        "overlays": "public",
+        "name": "panther-chromium-pfq",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -61809,28 +58088,30 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
+        "tests_supported": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "peach-release-group": {
+    "panther-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -61838,231 +58119,17 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "peach_pit"
+            "panther"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
+        "build_tests": false,
         "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "peach_pit"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "peach_pit-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "peach_pi"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "peach_pi-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi",
-                    "highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -62072,44 +58139,37 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal); Group config (boards: peach_pit, peach_pi)",
-        "dev_installer_prebuilts": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peach-release-group",
+        "name": "panther-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -62123,15 +58183,15 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
-        "upload_hw_test_artifacts": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
@@ -62141,44 +58201,44 @@
             "-cros-debug",
             "-highdpi"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "peach_pi-chrome-pfq": {
+    "panther-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pi"
+            "panther"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -62186,26 +58246,28 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "peach_pi-chrome-pfq",
-        "overlays": "both",
+        "name": "panther-full",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -62214,7 +58276,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -62224,26 +58286,26 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
+        "tests_supported": true,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "peach_pi-chromium-pfq": {
+    "panther-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -62255,18 +58317,18 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pi"
+            "panther"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
@@ -62275,7 +58337,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Commit Queue (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -62294,24 +58356,24 @@
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peach_pi-chromium-pfq",
+        "name": "panther-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": null,
+        "paladin_builder_name": "panther paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -62321,220 +58383,26 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
+        "tests_supported": true,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "peach_pi-firmware": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "peach_pi"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Firmware Canary",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": false,
-        "gcc_githash": null,
-        "git_sync": false,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": true,
-        "image_test": false,
-        "images": [],
-        "important": false,
-        "internal": true,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
-        "master": false,
-        "name": "peach_pi-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": false,
-        "profile": null,
-        "push_image": true,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": false,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
+            "chrome_internal"
         ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "peach_pi-full": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "peach_pi"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "full",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Full Builds",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": true,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": false,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
-        "master": false,
-        "name": "peach_pi-full",
-        "overlays": "public",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "public",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "peach_pi-payloads": {
+    "panther-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -62546,7 +58414,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pi"
+            "panther"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -62592,7 +58460,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peach_pi-payloads",
+        "name": "panther-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -62629,7 +58497,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "peach_pi-release": {
+    "panther-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -62641,7 +58509,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "peach_pi"
+            "panther"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -62694,7 +58562,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peach_pi-release",
+        "name": "panther-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -62714,10 +58582,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -62728,15 +58596,18 @@
         "useflags": [
             "chrome_internal",
             "-cros-debug",
-            "-highdpi",
-            "highdpi"
+            "-highdpi"
         ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "peach_pi-release-afdo": {
+    "panther-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -62748,7 +58619,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "peach_pi"
+            "panther"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -62768,7 +58639,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "peach_pi"
+                    "panther"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -62823,7 +58694,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "peach_pi-release-afdo-generate",
+                "name": "panther-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -62843,10 +58714,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": false,
+                "tests_supported": true,
                 "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": false,
+                "unittests": true,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -62862,7 +58733,11 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": []
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
             },
             {
                 "afdo_generate": false,
@@ -62876,7 +58751,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "peach_pi"
+                    "panther"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -62931,7 +58806,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "peach_pi-release-afdo-use",
+                "name": "panther-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -62951,10 +58826,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": false,
+                "tests_supported": true,
                 "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": false,
+                "unittests": true,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -62970,7 +58845,11 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": []
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
             }
         ],
         "chrome_binhost_only": false,
@@ -63020,7 +58899,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peach_pi-release-afdo",
+        "name": "panther-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -63040,10 +58919,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -63059,9 +58938,13 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "peach_pi-release-afdo-generate": {
+    "panther-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -63073,7 +58956,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "peach_pi"
+            "panther"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -63128,7 +59011,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peach_pi-release-afdo-generate",
+        "name": "panther-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -63148,10 +59031,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -63167,9 +59050,13 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "peach_pi-release-afdo-use": {
+    "panther-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -63181,7 +59068,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "peach_pi"
+            "panther"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -63236,7 +59123,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peach_pi-release-afdo-use",
+        "name": "panther-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -63256,10 +59143,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -63275,9 +59162,13 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "peach_pi-tot-chrome-pfq-informational": {
+    "panther-test-ap": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -63289,27 +59180,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pi"
+            "panther"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "pfq",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
+        "chrome_rev": null,
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
+        "chromeos_official": false,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chrome Uprev & Build (internal)",
+        "description": "WiFi AP images used in testing",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -63335,7 +59226,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "peach_pi-tot-chrome-pfq-informational",
+        "name": "panther-test-ap",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -63346,7 +59237,7 @@
         "postsync_reexec": true,
         "pre_cq": false,
         "prebuilts": false,
-        "profile": null,
+        "profile": "testbed-ap",
         "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
@@ -63355,26 +59246,24 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "peach_pi-tot-chromium-pfq-informational": {
+    "panther-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -63386,7 +59275,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pi"
+            "panther"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -63399,14 +59288,14 @@
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Informational Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -63426,14 +59315,14 @@
             "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "peach_pi-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "name": "panther-tot-chrome-pfq-informational",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -63452,10 +59341,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -63463,13 +59352,17 @@
         "use_chrome_lkgm": false,
         "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite"
+        ]
     },
-    "peach_pit-chrome-pfq": {
+    "panther-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -63481,7 +59374,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pit"
+            "panther"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -63490,18 +59383,18 @@
         "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Informational Chromium Uprev & Build (public)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -63521,14 +59414,14 @@
             "test"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "peach_pit-chrome-pfq",
-        "overlays": "both",
+        "name": "panther-tot-chromium-pfq-informational",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -63537,7 +59430,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -63547,26 +59440,26 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite"
+        ]
     },
-    "peach_pit-chromium-pfq": {
+    "panther_embedded-minimal-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -63578,18 +59471,18 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pit"
+            "panther_embedded"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
@@ -63598,7 +59491,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Commit Queue",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -63618,16 +59511,16 @@
             "test"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": true,
         "master": false,
-        "name": "peach_pit-chromium-pfq",
-        "overlays": "both",
+        "name": "panther_embedded-minimal-paladin",
+        "overlays": "public",
         "packages": [],
-        "paladin_builder_name": null,
+        "paladin_builder_name": "panther_embedded-minimal paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -63635,7 +59528,7 @@
         "postsync_reexec": true,
         "pre_cq": false,
         "prebuilts": "public",
-        "profile": null,
+        "profile": "minimal",
         "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
@@ -63643,15 +59536,15 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -63661,7 +59554,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "peach_pit-firmware": {
+    "panther_embedded-minimal-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -63673,12 +59566,12 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "peach_pit"
+            "panther_embedded"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
+        "build_tests": true,
         "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
@@ -63693,13 +59586,13 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Canary",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -63708,20 +59601,22 @@
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": true,
-        "image_test": false,
-        "images": [],
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peach_pit-firmware",
+        "name": "panther_embedded-minimal-release",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -63730,7 +59625,7 @@
         "postsync_reexec": true,
         "pre_cq": false,
         "prebuilts": false,
-        "profile": null,
+        "profile": "minimal",
         "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
@@ -63739,13 +59634,13 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": false,
-        "tests_supported": false,
-        "trybot_list": false,
+        "tests_supported": true,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
@@ -63755,44 +59650,44 @@
             "-cros-debug",
             "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "peach_pit-full": {
+    "parrot-chrome-perf": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pit"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
+        "description": "Chrome Performance test bot",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -63800,28 +59695,28 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": true,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 5400,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "peach_pit-full",
-        "overlays": "public",
+        "name": "parrot-chrome-perf",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -63830,7 +59725,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -63840,24 +59735,27 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
+        "uprev": false,
+        "use_chrome_lkgm": true,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "peach_pit-paladin": {
+    "parrot-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -63869,27 +59767,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pit"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue (internal)",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -63902,26 +59800,23 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": false,
         "image_test": false,
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peach_pit-paladin",
+        "name": "parrot-chrome-pfq",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "peach_pit paladin",
+        "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -63938,14 +59833,14 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
+        "tests_supported": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -63955,9 +59850,11 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "peach_pit-payloads": {
+    "parrot-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -63969,27 +59866,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pit"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "payloads",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": false,
+        "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Regenerate release payloads.",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -64015,17 +59912,17 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peach_pit-payloads",
+        "name": "parrot-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -64039,10 +59936,10 @@
         "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
-        "upload_hw_test_artifacts": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -64050,13 +59947,15 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "peach_pit-release": {
+    "parrot-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -64064,17 +59963,17 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "peach_pit"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
+        "build_tests": false,
         "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -64084,44 +59983,37 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
+        "image_test": false,
+        "images": [],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peach_pit-release",
+        "name": "parrot-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -64135,15 +60027,15 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
-        "upload_hw_test_artifacts": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
@@ -64153,261 +60045,44 @@
             "-cros-debug",
             "-highdpi"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "peach_pit-release-afdo": {
+    "parrot-full": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pit"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": true,
-                "afdo_update_ebuild": true,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "peach_pit"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "peach_pit-release-afdo-generate",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": false,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "peach_pit"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "peach_pit-release-afdo-use",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": false,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "build_type": "full",
+        "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -64415,20 +60090,13 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
+        "hw_tests": [],
+        "hwqual": false,
         "image_test": true,
         "images": [
             "base",
@@ -64436,14 +60104,14 @@
             "factory_install"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "peach_pit-release-afdo",
-        "overlays": "both",
+        "name": "parrot-full",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -64452,7 +60120,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -64460,62 +60128,60 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
+        "tests_supported": true,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
+        "useflags": [],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "pfq_suite"
+        ]
     },
-    "peach_pit-release-afdo-generate": {
+    "parrot-paladin": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pit"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Commit Queue (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -64529,38 +60195,32 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
         ],
-        "hwqual": true,
-        "image_test": true,
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peach_pit-release-afdo-generate",
+        "name": "parrot-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": null,
+        "paladin_builder_name": "parrot paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -64568,62 +60228,60 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
+        "tests_supported": true,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
+            "chrome_internal"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "peach_pit-release-afdo-use": {
+    "parrot-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pit"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
+        "chromeos_official": false,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -64636,33 +60294,24 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peach_pit-release-afdo-use",
+        "name": "parrot-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -64676,62 +60325,58 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
+        "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
+        "unittests": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "peach_pit-tot-chrome-pfq-informational": {
+    "parrot-pre-cq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
-        "archive": true,
+        "archive": false,
         "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peach_pit"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
-        "build_packages_in_background": false,
+        "build_packages_in_background": true,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "binary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
+        "chrome_rev": null,
         "chrome_sdk": false,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
+        "compilecheck": true,
+        "cpe_export": false,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Informational Chrome Uprev & Build (internal)",
+        "debug_symbols": false,
+        "description": "Verifies compilation only",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -64750,14 +60395,14 @@
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "peach_pit-tot-chrome-pfq-informational",
+        "name": "parrot-pre-cq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -64766,7 +60411,7 @@
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
-        "pre_cq": false,
+        "pre_cq": true,
         "prebuilts": false,
         "profile": null,
         "push_image": false,
@@ -64777,16 +60422,16 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
+        "tests_supported": true,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
             "chrome_internal"
@@ -64794,42 +60439,44 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite"
+        ]
     },
-    "peach_pit-tot-chromium-pfq-informational": {
+    "parrot-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "peach_pit"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
-        "critical_for_chrome": false,
+        "critical_for_chrome": true,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -64841,24 +60488,31 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "peach_pit-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "name": "parrot-release",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -64866,53 +60520,286 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
+        "tests_supported": true,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "peppy-chrome-pfq": {
+    "parrot-release-afdo": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "peppy"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
-        "child_configs": [],
+        "build_type": "canary",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": true,
+                "afdo_update_ebuild": true,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "parrot"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "parrot-release-afdo-generate",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "parrot"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "parrot-release-afdo-use",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
+            }
+        ],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -64923,7 +60810,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -64936,20 +60823,29 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peppy-chrome-pfq",
+        "name": "parrot-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -64959,7 +60855,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -64967,7 +60863,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
@@ -64975,54 +60871,58 @@
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": [
-            "pfq_suite"
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
         ]
     },
-    "peppy-chromium-pfq": {
+    "parrot-release-afdo-generate": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "peppy"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -65035,20 +60935,29 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peppy-chromium-pfq",
+        "name": "parrot-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -65058,7 +60967,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -65066,7 +60975,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
@@ -65074,24 +60983,30 @@
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": [
-            "pfq_suite"
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
         ]
     },
-    "peppy-firmware": {
+    "parrot-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -65099,17 +61014,17 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "peppy"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
+        "build_tests": true,
         "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -65119,35 +61034,44 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Canary",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": true,
-        "image_test": false,
-        "images": [],
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peppy-firmware",
+        "name": "parrot-release-afdo-use",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -65157,21 +61081,21 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
+        "signer_tests": true,
+        "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
@@ -65181,58 +61105,284 @@
             "-cros-debug",
             "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "peppy-full": {
+    "parrot-release-group": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "peppy"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
-        "child_configs": [],
+        "build_type": "canary",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "parrot"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": true,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "parrot-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "parrot_ivb"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": false,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "parrot_ivb-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
-        "critical_for_chrome": false,
+        "critical_for_chrome": true,
         "debug_symbols": true,
-        "description": "Full Builds",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
         "image_test": true,
         "images": [
             "base",
@@ -65240,31 +61390,31 @@
             "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "peppy-full",
-        "overlays": "public",
+        "name": "parrot-release-group",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": true,
@@ -65272,20 +61422,26 @@
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": [
-            "pfq_suite"
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
         ]
     },
-    "peppy-paladin": {
+    "parrot-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -65297,27 +61453,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peppy"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue (internal)",
+        "description": "Informational Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -65336,24 +61492,24 @@
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_version": false,
         "master": false,
-        "name": "peppy-paladin",
+        "name": "parrot-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "peppy paladin",
+        "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -65364,15 +61520,15 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
         "useflags": [
             "chrome_internal"
@@ -65381,10 +61537,10 @@
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": [
-            "dev_mode_test"
+            "smoke_suite"
         ]
     },
-    "peppy-payloads": {
+    "parrot-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -65396,27 +61552,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peppy"
+            "parrot"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "payloads",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "tot",
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": false,
+        "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Regenerate release payloads.",
+        "description": "Informational Chromium Uprev & Build (public)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -65436,17 +61592,17 @@
             "test"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "peppy-payloads",
-        "overlays": "both",
+        "name": "parrot-tot-chromium-pfq-informational",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -65466,41 +61622,43 @@
         "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
-        "upload_hw_test_artifacts": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
         "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite"
+        ]
     },
-    "peppy-release": {
+    "parrot_ivb-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peppy"
+            "parrot_ivb"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -65511,8 +61669,8 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
+        "description": "Preflight Chrome Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -65524,139 +61682,525 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peppy-release",
+        "name": "parrot_ivb-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
+            "chrome_internal"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
+            "pfq_suite"
         ]
     },
-    "peppy-release-afdo": {
+    "parrot_ivb-chromium-pfq": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peppy"
+            "parrot_ivb"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": true,
-                "afdo_update_ebuild": true,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "peppy"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Preflight Chromium Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "parrot_ivb-chromium-pfq",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "parrot_ivb-full": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "parrot_ivb"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "full",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Full Builds",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "parrot_ivb-full",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "parrot_ivb-payloads": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "parrot_ivb"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "payloads",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": false,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Regenerate release payloads.",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "parrot_ivb-payloads",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": true,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "parrot_ivb-release": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": true,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "parrot_ivb"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": true,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "parrot_ivb-release",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": true,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": null,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "parrot_ivb-release-afdo": {
+        "afdo_generate": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "parrot_ivb"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": true,
+                "afdo_update_ebuild": true,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "parrot_ivb"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
                     "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
                     "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
                     "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
@@ -65676,7 +62220,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "peppy-release-afdo-generate",
+                "name": "parrot_ivb-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -65733,7 +62277,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "peppy"
+                    "parrot_ivb"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -65788,7 +62332,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "peppy-release-afdo-use",
+                "name": "parrot_ivb-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -65881,7 +62425,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peppy-release-afdo",
+        "name": "parrot_ivb-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -65926,7 +62470,7 @@
             "cros_vm_test"
         ]
     },
-    "peppy-release-afdo-generate": {
+    "parrot_ivb-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -65938,7 +62482,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "peppy"
+            "parrot_ivb"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -65993,7 +62537,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peppy-release-afdo-generate",
+        "name": "parrot_ivb-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -66038,7 +62582,7 @@
             "cros_vm_test"
         ]
     },
-    "peppy-release-afdo-use": {
+    "parrot_ivb-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -66050,7 +62594,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "peppy"
+            "parrot_ivb"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -66105,7 +62649,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "peppy-release-afdo-use",
+        "name": "parrot_ivb-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -66150,7 +62694,7 @@
             "cros_vm_test"
         ]
     },
-    "peppy-tot-chrome-pfq-informational": {
+    "parrot_ivb-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -66162,7 +62706,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peppy"
+            "parrot_ivb"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -66208,7 +62752,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "peppy-tot-chrome-pfq-informational",
+        "name": "parrot_ivb-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -66249,7 +62793,7 @@
             "smoke_suite"
         ]
     },
-    "peppy-tot-chromium-pfq-informational": {
+    "parrot_ivb-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -66261,7 +62805,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "peppy"
+            "parrot_ivb"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -66307,7 +62851,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "peppy-tot-chromium-pfq-informational",
+        "name": "parrot_ivb-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -66346,7 +62890,7 @@
             "smoke_suite"
         ]
     },
-    "pineview-full-group": {
+    "peach-full-group": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -66358,7 +62902,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "x86-mario"
+            "peach_pit"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -66378,7 +62922,7 @@
                 "binhost_key": null,
                 "board_replace": false,
                 "boards": [
-                    "x86-mario"
+                    "peach_pit"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -66426,7 +62970,7 @@
                 "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
                 "manifest_version": false,
                 "master": false,
-                "name": "x86-mario-full",
+                "name": "peach_pit-full",
                 "overlays": "public",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -66446,10 +62990,10 @@
                 "shared_user_password": null,
                 "signer_tests": false,
                 "sync_chrome": null,
-                "tests_supported": true,
+                "tests_supported": false,
                 "trybot_list": true,
                 "unittest_blacklist": [],
-                "unittests": true,
+                "unittests": false,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": false,
@@ -66461,9 +63005,7 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": [
-                    "pfq_suite"
-                ]
+                "vm_tests": []
             },
             {
                 "afdo_generate": false,
@@ -66477,7 +63019,7 @@
                 "binhost_key": null,
                 "board_replace": false,
                 "boards": [
-                    "x86-alex"
+                    "peach_pi"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -66525,7 +63067,7 @@
                 "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
                 "manifest_version": false,
                 "master": false,
-                "name": "x86-alex-full",
+                "name": "peach_pi-full",
                 "overlays": "public",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -66545,298 +63087,7 @@
                 "shared_user_password": null,
                 "signer_tests": false,
                 "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "x86-zgb"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "x86-zgb-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "x86-alex_he"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": false,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "x86-alex_he-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "x86-zgb_he"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": false,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "x86-zgb_he-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
+                "tests_supported": false,
                 "trybot_list": true,
                 "unittest_blacklist": [],
                 "unittests": null,
@@ -66866,7 +63117,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds; Group config (boards: x86-mario, x86-alex, x86-zgb, x86-alex_he, x86-zgb_he)",
+        "description": "Full Builds; Group config (boards: peach_pit, peach_pi)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -66894,7 +63145,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "pineview-full-group",
+        "name": "peach-full-group",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -66914,10 +63165,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -66929,11 +63180,9 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "pineview-release-group": {
+    "peach-release-group": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -66945,7 +63194,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "x86-mario"
+            "peach_pit"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -66965,7 +63214,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "x86-mario"
+                    "peach_pit"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -67018,117 +63267,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "x86-mario-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "x86-alex"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "x86-alex-release",
+                "name": "peach_pit-release",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -67148,10 +63287,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": true,
+                "tests_supported": false,
                 "trybot_list": true,
                 "unittest_blacklist": [],
-                "unittests": null,
+                "unittests": false,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -67181,7 +63320,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "x86-zgb"
+                    "peach_pi"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -67234,7 +63373,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "x86-zgb-release",
+                "name": "peach_pi-release",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -67254,7 +63393,7 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": true,
+                "tests_supported": false,
                 "trybot_list": true,
                 "unittest_blacklist": [],
                 "unittests": null,
@@ -67268,209 +63407,8 @@
                 "useflags": [
                     "chrome_internal",
                     "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "x86-alex_he"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": false,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "x86-alex_he-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": true,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": false,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "x86-zgb_he"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": false,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "x86-zgb_he-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": true,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": false,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
+                    "-highdpi",
+                    "highdpi"
                 ],
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
@@ -67490,7 +63428,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal); Group config (boards: x86-mario, x86-alex, x86-zgb, x86-alex_he, x86-zgb_he)",
+        "description": "Release Builds (canary) (internal); Group config (boards: peach_pit, peach_pi)",
         "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -67523,7 +63461,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "pineview-release-group",
+        "name": "peach-release-group",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -67543,10 +63481,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -67562,636 +63500,41 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "pre-cq-group": {
+    "peach_pi-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
-        "archive": false,
+        "archive": true,
         "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "rambi"
+            "peach_pi"
         ],
         "branch": false,
         "build_before_patching": false,
-        "build_packages_in_background": true,
+        "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "binary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": false,
-                "archive_build_debug": false,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "rambi"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "binary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": false,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": false,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": false,
-                "description": "Verifies compilation, vm/unit tests, and building an image",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": false,
-                "images": [
-                    "test"
-                ],
-                "important": true,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "rambi-pre-cq",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": true,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": false,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal"
-                ],
-                "usepkg_build_packages": true,
-                "usepkg_toolchain": true,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": false,
-                "archive_build_debug": false,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "daisy_spring"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "binary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": false,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": false,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": false,
-                "description": "Verifies compilation, vm/unit tests, and building an image",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": false,
-                "images": [
-                    "test"
-                ],
-                "important": true,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "daisy_spring-pre-cq",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": true,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": false,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": false,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal"
-                ],
-                "usepkg_build_packages": true,
-                "usepkg_toolchain": true,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": false,
-                "archive_build_debug": false,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "samus"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "binary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": false,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": true,
-                "cpe_export": false,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": false,
-                "description": "Verifies compilation only",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": false,
-                "images": [
-                    "test"
-                ],
-                "important": true,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "samus-pre-cq",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": true,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": false,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal"
-                ],
-                "usepkg_build_packages": true,
-                "usepkg_toolchain": true,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": false,
-                "archive_build_debug": false,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "lumpy"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "binary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": false,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": true,
-                "cpe_export": false,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": false,
-                "description": "Verifies compilation only",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": false,
-                "images": [
-                    "test"
-                ],
-                "important": true,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "lumpy-pre-cq",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": true,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": false,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal"
-                ],
-                "usepkg_build_packages": true,
-                "usepkg_toolchain": true,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": false,
-                "archive_build_debug": false,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "parrot"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "binary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": false,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": true,
-                "cpe_export": false,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": false,
-                "description": "Verifies compilation only",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": false,
-                "images": [
-                    "test"
-                ],
-                "important": true,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "parrot-pre-cq",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": true,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": false,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": false,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal"
-                ],
-                "usepkg_build_packages": true,
-                "usepkg_toolchain": true,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": false,
-                "archive_build_debug": false,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "duck"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "binary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": false,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": false,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": false,
-                "description": "Verifies compilation, vm/unit tests, and building an image",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": false,
-                "images": [
-                    "test"
-                ],
-                "important": true,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "duck-pre-cq",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": true,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": false,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": false,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal"
-                ],
-                "usepkg_build_packages": true,
-                "usepkg_toolchain": true,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "build_type": "chrome",
+        "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
-        "cpe_export": false,
+        "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
-        "debug_symbols": false,
-        "description": "Verifies compilation, vm/unit tests, and building an image",
+        "debug_symbols": true,
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -68210,14 +63553,14 @@
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "pre-cq-group",
+        "name": "peach_pi-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -68226,8 +63569,8 @@
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
-        "pre_cq": true,
-        "prebuilts": false,
+        "pre_cq": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -68237,14 +63580,14 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -68254,11 +63597,9 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "pre-cq-launcher": {
+    "peach_pi-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -68269,17 +63610,19 @@
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
-        "boards": [],
+        "boards": [
+            "peach_pi"
+        ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "priest",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
@@ -68288,7 +63631,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Launcher for Pre-CQ builders",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -68299,26 +63642,22 @@
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
-        "health_alert_recipients": [
-            "chromeos-build-alerts@google.com",
-            "tree",
-            "build"
-        ],
-        "health_threshold": 1,
+        "health_alert_recipients": [],
+        "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
         "image_test": false,
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "pre-cq-launcher",
+        "name": "peach_pi-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -68328,7 +63667,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -68338,48 +63677,46 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "quawks-chrome-pfq": {
+    "peach_pi-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "quawks"
+            "peach_pi"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
+        "build_tests": false,
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -68389,13 +63726,13 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Firmware Canary",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -68403,11 +63740,9 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": false,
+        "hwqual": true,
         "image_test": false,
-        "images": [
-            "test"
-        ],
+        "images": [],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
@@ -68415,9 +63750,11 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "quawks-chrome-pfq",
+        "name": "peach_pi-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -68425,59 +63762,59 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
+        "sync_chrome": false,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "quawks-chromium-pfq": {
+    "peach_pi-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "quawks"
+            "peach_pi"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -68488,7 +63825,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -68496,26 +63833,28 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "quawks-chromium-pfq",
-        "overlays": "both",
+        "name": "peach_pi-full",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -68534,64 +63873,62 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
+        "tests_supported": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "quawks-depthcharge-firmware": {
+    "peach_pi-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "quawks"
+            "peach_pi"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
+        "build_tests": true,
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
+        "chromeos_official": false,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Canary",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -68599,9 +63936,11 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": true,
+        "hwqual": false,
         "image_test": false,
-        "images": [],
+        "images": [
+            "test"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
@@ -68609,13 +63948,11 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "quawks-depthcharge-firmware",
+        "name": "peach_pi-payloads",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -68623,18 +63960,18 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
+        "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
+        "unittests": true,
         "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -68642,77 +63979,82 @@
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "depthcharge"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "quawks-depthcharge-full-firmware": {
+    "peach_pi-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "quawks"
+            "peach_pi"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "full",
+        "build_tests": true,
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Informational",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
-        "images": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": false,
+        "manifest_version": true,
         "master": false,
-        "name": "quawks-depthcharge-full-firmware",
+        "name": "peach_pi-release",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -68720,37 +64062,40 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
-        "trybot_list": false,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "depthcharge"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi",
+            "highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "quawks-firmware": {
+    "peach_pi-release-afdo": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
@@ -68759,17 +64104,234 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "quawks"
+            "peach_pi"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
+        "build_tests": true,
         "build_type": "canary",
-        "child_configs": [],
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": true,
+                "afdo_update_ebuild": true,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "peach_pi"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "peach_pi-release-afdo-generate",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "peach_pi"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "peach_pi-release-afdo-use",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -68779,35 +64341,44 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Canary",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": true,
-        "image_test": false,
-        "images": [],
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "quawks-firmware",
+        "name": "peach_pi-release-afdo",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -68817,21 +64388,21 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
-        "tests_supported": true,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
@@ -68841,44 +64412,44 @@
             "-cros-debug",
             "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "quawks-full": {
+    "peach_pi-release-afdo-generate": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "quawks"
+            "peach_pi"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -68886,13 +64457,20 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
         "image_test": true,
         "images": [
             "base",
@@ -68900,14 +64478,14 @@
             "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "quawks-full",
-        "overlays": "public",
+        "name": "peach_pi-release-afdo-generate",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -68916,7 +64494,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -68924,60 +64502,62 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "quawks-paladin": {
+    "peach_pi-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "quawks"
+            "peach_pi"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue (internal)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -68990,11 +64570,20 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
@@ -69003,17 +64592,17 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "quawks-paladin",
+        "name": "peach_pi-release-afdo-use",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "quawks paladin",
+        "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -69021,28 +64610,30 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
-        "upload_symbols": false,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "quawks-payloads": {
+    "peach_pi-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -69054,27 +64645,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "quawks"
+            "peach_pi"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "payloads",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "tot",
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Regenerate release payloads.",
+        "description": "Informational Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -69098,13 +64689,13 @@
         "latest_toolchain": false,
         "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_version": false,
         "master": false,
-        "name": "quawks-payloads",
+        "name": "peach_pi-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -69120,57 +64711,59 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": false,
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "quawks-release": {
+    "peach_pi-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "quawks"
+            "peach_pi"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
-        "dev_installer_prebuilts": true,
+        "description": "Informational Chromium Uprev & Build (public)",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -69182,31 +64775,24 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "quawks-release",
-        "overlays": "both",
+        "name": "peach_pi-tot-chromium-pfq-informational",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -69214,287 +64800,53 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi",
-            "highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "quawks-release-afdo": {
+    "peach_pit-chrome-pfq": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "quawks"
+            "peach_pit"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": true,
-                "afdo_update_ebuild": true,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "quawks"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "quawks-release-afdo-generate",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": false,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "quawks"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "quawks-release-afdo-use",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": false,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
-            }
-        ],
+        "build_type": "chrome",
+        "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -69505,7 +64857,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -69518,29 +64870,20 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "quawks-release-afdo",
+        "name": "peach_pit-chrome-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -69550,7 +64893,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -69558,66 +64901,60 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
+            "chrome_internal"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "quawks-release-afdo-generate": {
+    "peach_pit-chromium-pfq": {
         "afdo_generate": false,
-        "afdo_generate_min": true,
-        "afdo_update_ebuild": true,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "quawks"
+            "peach_pit"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "canary",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -69630,29 +64967,20 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "quawks-release-afdo-generate",
+        "name": "peach_pit-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -69662,7 +64990,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -69670,38 +64998,30 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": true,
-        "uprev": true,
+        "upload_symbols": false,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "quawks-release-afdo-use": {
+    "peach_pit-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -69709,17 +65029,17 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "quawks"
+            "peach_pit"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
+        "build_tests": false,
         "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -69729,44 +65049,35 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal)",
+        "description": "Firmware Canary",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
+        "image_test": false,
+        "images": [],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "quawks-release-afdo-use",
+        "name": "peach_pit-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -69776,21 +65087,21 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
-        "tests_supported": true,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
@@ -69800,48 +65111,44 @@
             "-cros-debug",
             "-highdpi"
         ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "quawks-tot-chrome-pfq-informational": {
+    "peach_pit-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "quawks"
+            "peach_pit"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
-        "chrome_sdk": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chrome Uprev & Build (internal)",
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -69849,26 +65156,28 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "quawks-tot-chrome-pfq-informational",
-        "overlays": "both",
+        "name": "peach_pit-full",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -69877,7 +65186,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -69887,16 +65196,114 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": false,
+        "tests_supported": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "peach_pit-paladin": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "peach_pit"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "paladin",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Commit Queue (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"cq\",\n    \"priority\": \"CQ\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": true,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "peach_pit-paladin",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": "peach_pit paladin",
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
             "chrome_internal"
@@ -69904,11 +65311,9 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "quawks-tot-chromium-pfq-informational": {
+    "peach_pit-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -69920,27 +65325,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "quawks"
+            "peach_pit"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
+        "chrome_rev": null,
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": true,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -69960,17 +65365,17 @@
             "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "quawks-tot-chromium-pfq-informational",
-        "overlays": "public",
+        "name": "peach_pit-payloads",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -69990,74 +65395,178 @@
         "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "rambi-a-full-group": {
+    "peach_pit-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
+        "afdo_use": true,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "peach_pit"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "peach_pit-release",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": true,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "peach_pit-release-afdo": {
+        "afdo_generate": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "rambi"
+            "peach_pit"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "canary",
         "child_configs": [
             {
                 "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
+                "afdo_generate_min": true,
+                "afdo_update_ebuild": true,
                 "afdo_use": false,
                 "archive": true,
                 "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "rambi"
+                    "peach_pit"
                 ],
                 "branch": false,
                 "build_before_patching": false,
                 "build_packages_in_background": false,
                 "build_tests": true,
-                "build_type": "full",
+                "build_type": "canary",
                 "child_configs": [],
                 "chrome_binhost_only": false,
                 "chrome_rev": null,
                 "chrome_sdk": true,
                 "chrome_sdk_build_chrome": true,
                 "chrome_sdk_goma": false,
-                "chromeos_official": false,
+                "chromeos_official": true,
                 "chroot_replace": true,
                 "compilecheck": false,
                 "cpe_export": true,
                 "create_delta_sysroot": false,
                 "critical_for_chrome": false,
                 "debug_symbols": true,
-                "description": "Full Builds",
+                "description": "Release Builds (canary) (internal)",
                 "dev_installer_prebuilts": false,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
@@ -70065,112 +65574,20 @@
                 "factory_install_netboot": true,
                 "factory_toolkit": true,
                 "gcc_githash": null,
-                "git_sync": true,
+                "git_sync": false,
                 "grouped": true,
                 "gs_path": "default",
                 "health_alert_recipients": [],
                 "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "rambi-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "pfq_suite"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "clapper"
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
                 ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
+                "hwqual": true,
                 "image_test": true,
                 "images": [
                     "base",
@@ -70178,14 +65595,14 @@
                     "factory_install"
                 ],
                 "important": false,
-                "internal": false,
+                "internal": true,
                 "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
                 "master": false,
-                "name": "clapper-full",
-                "overlays": "public",
+                "name": "peach_pit-release-afdo-generate",
+                "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
                 "paygen": false,
@@ -70194,7 +65611,7 @@
                 "postsync_patch": true,
                 "postsync_reexec": true,
                 "pre_cq": false,
-                "prebuilts": "public",
+                "prebuilts": false,
                 "profile": null,
                 "push_image": false,
                 "push_overlays": null,
@@ -70202,20 +65619,24 @@
                 "rootfs_verification": true,
                 "sanity_check_slaves": null,
                 "shared_user_password": null,
-                "signer_tests": false,
+                "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
+                "tests_supported": false,
+                "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": null,
+                "unittests": false,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
-                "upload_symbols": false,
+                "upload_symbols": true,
                 "uprev": true,
                 "use_chrome_lkgm": false,
                 "use_lkgm": false,
                 "use_sdk": true,
-                "useflags": [],
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
@@ -70225,35 +65646,35 @@
                 "afdo_generate": false,
                 "afdo_generate_min": false,
                 "afdo_update_ebuild": false,
-                "afdo_use": false,
+                "afdo_use": true,
                 "archive": true,
                 "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "enguarde"
+                    "peach_pit"
                 ],
                 "branch": false,
                 "build_before_patching": false,
-                "build_packages_in_background": true,
+                "build_packages_in_background": false,
                 "build_tests": true,
-                "build_type": "full",
+                "build_type": "canary",
                 "child_configs": [],
                 "chrome_binhost_only": false,
                 "chrome_rev": null,
                 "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_build_chrome": true,
                 "chrome_sdk_goma": false,
-                "chromeos_official": false,
+                "chromeos_official": true,
                 "chroot_replace": true,
                 "compilecheck": false,
                 "cpe_export": true,
                 "create_delta_sysroot": false,
                 "critical_for_chrome": false,
                 "debug_symbols": true,
-                "description": "Full Builds",
+                "description": "Release Builds (canary) (internal)",
                 "dev_installer_prebuilts": false,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
@@ -70261,13 +65682,20 @@
                 "factory_install_netboot": true,
                 "factory_toolkit": true,
                 "gcc_githash": null,
-                "git_sync": true,
+                "git_sync": false,
                 "grouped": true,
                 "gs_path": "default",
                 "health_alert_recipients": [],
                 "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
                 "image_test": true,
                 "images": [
                     "base",
@@ -70275,14 +65703,14 @@
                     "factory_install"
                 ],
                 "important": false,
-                "internal": false,
+                "internal": true,
                 "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
                 "master": false,
-                "name": "enguarde-full",
-                "overlays": "public",
+                "name": "peach_pit-release-afdo-use",
+                "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
                 "paygen": false,
@@ -70291,7 +65719,7 @@
                 "postsync_patch": true,
                 "postsync_reexec": true,
                 "pre_cq": false,
-                "prebuilts": "public",
+                "prebuilts": false,
                 "profile": null,
                 "push_image": false,
                 "push_overlays": null,
@@ -70299,117 +65727,24 @@
                 "rootfs_verification": true,
                 "sanity_check_slaves": null,
                 "shared_user_password": null,
-                "signer_tests": false,
+                "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
+                "tests_supported": false,
+                "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": null,
+                "unittests": false,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
-                "upload_symbols": false,
+                "upload_symbols": true,
                 "uprev": true,
                 "use_chrome_lkgm": false,
                 "use_lkgm": false,
                 "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "expresso"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "expresso-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
@@ -70421,14 +65756,14 @@
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds; Group config (boards: rambi, clapper, enguarde, expresso)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -70436,13 +65771,20 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
         "image_test": true,
         "images": [
             "base",
@@ -70450,14 +65792,14 @@
             "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "rambi-a-full-group",
-        "overlays": "public",
+        "name": "peach_pit-release-afdo",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -70466,7 +65808,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -70474,28 +65816,138 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "rambi-a-release-group": {
+    "peach_pit-release-afdo-generate": {
+        "afdo_generate": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "peach_pit"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "peach_pit-release-afdo-generate",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "peach_pit-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -70507,443 +65959,14 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "rambi"
+            "peach_pit"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
         "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "rambi"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "rambi-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "clapper"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "clapper-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "enguarde"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "enguarde-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "expresso"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "expresso-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
         "chrome_sdk": true,
@@ -70956,8 +65979,8 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal); Group config (boards: rambi, clapper, enguarde, expresso)",
-        "dev_installer_prebuilts": true,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -70970,10 +65993,12 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
         ],
         "hwqual": true,
         "image_test": true,
@@ -70982,18 +66007,18 @@
             "test",
             "factory_install"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rambi-a-release-group",
+        "name": "peach_pit-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -71001,7 +66026,7 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
@@ -71009,10 +66034,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -71028,425 +66053,321 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "peach_pit-tot-chrome-pfq-informational": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "peach_pit"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Informational Chrome Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": false,
+        "master": false,
+        "name": "peach_pit-tot-chrome-pfq-informational",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": true,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "peach_pit-tot-chromium-pfq-informational": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "peach_pit"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Informational Chromium Uprev & Build (public)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "peach_pit-tot-chromium-pfq-informational",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": true,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "peppy-chrome-pfq": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "peppy"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Preflight Chrome Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "peppy-chrome-pfq",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
         "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
+            "pfq_suite"
         ]
     },
-    "rambi-b-full-group": {
+    "peppy-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "glimmer"
+            "peppy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "glimmer"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "glimmer-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "pfq_suite"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "gnawty"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "gnawty-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "kip"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "kip-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "quawks"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "quawks-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "build_type": "chrome",
+        "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
@@ -71457,7 +66378,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds; Group config (boards: glimmer, gnawty, kip, quawks)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -71465,28 +66386,26 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "rambi-b-full-group",
-        "overlays": "public",
+        "name": "peppy-chromium-pfq",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -71506,29 +66425,29 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": [
             "pfq_suite"
         ]
     },
-    "rambi-b-release-group": {
+    "peppy-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": true,
+        "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -71536,447 +66455,17 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "glimmer"
+            "peppy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
+        "build_tests": false,
         "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "glimmer"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "glimmer-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "gnawty"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "gnawty-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "kip"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "kip-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "quawks"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "quawks-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi",
-                    "highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            }
-        ],
+        "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -71986,44 +66475,37 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal); Group config (boards: glimmer, gnawty, kip, quawks)",
-        "dev_installer_prebuilts": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": true,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rambi-b-release-group",
+        "name": "peppy-firmware",
         "overlays": "both",
-        "packages": [],
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -72037,15 +66519,15 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
-        "sync_chrome": null,
+        "signer_tests": false,
+        "sync_chrome": false,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
@@ -72055,167 +66537,467 @@
             "-cros-debug",
             "-highdpi"
         ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "peppy-full": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "peppy"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "full",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Full Builds",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "peppy-full",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
+            "pfq_suite"
         ]
     },
-    "rambi-c-full-group": {
+    "peppy-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "squawks"
+            "peppy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "squawks"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "squawks-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "pfq_suite"
-                ]
-            },
+        "build_type": "paladin",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Commit Queue (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": true,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "peppy-paladin",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": "peppy paladin",
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "dev_mode_test"
+        ]
+    },
+    "peppy-payloads": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "peppy"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "payloads",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": false,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Regenerate release payloads.",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "peppy-payloads",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": true,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "peppy-release": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": true,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "peppy"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "peppy-release",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": true,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
+    },
+    "peppy-release-afdo": {
+        "afdo_generate": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "peppy"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [
             {
                 "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
+                "afdo_generate_min": true,
+                "afdo_update_ebuild": true,
                 "afdo_use": false,
                 "archive": true,
                 "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "swanky"
+                    "peppy"
                 ],
                 "branch": false,
                 "build_before_patching": false,
-                "build_packages_in_background": true,
+                "build_packages_in_background": false,
                 "build_tests": true,
-                "build_type": "full",
+                "build_type": "canary",
                 "child_configs": [],
                 "chrome_binhost_only": false,
                 "chrome_rev": null,
                 "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_build_chrome": true,
                 "chrome_sdk_goma": false,
-                "chromeos_official": false,
+                "chromeos_official": true,
                 "chroot_replace": true,
                 "compilecheck": false,
                 "cpe_export": true,
                 "create_delta_sysroot": false,
                 "critical_for_chrome": false,
                 "debug_symbols": true,
-                "description": "Full Builds",
+                "description": "Release Builds (canary) (internal)",
                 "dev_installer_prebuilts": false,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
@@ -72223,13 +67005,20 @@
                 "factory_install_netboot": true,
                 "factory_toolkit": true,
                 "gcc_githash": null,
-                "git_sync": true,
+                "git_sync": false,
                 "grouped": true,
                 "gs_path": "default",
                 "health_alert_recipients": [],
                 "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
                 "image_test": true,
                 "images": [
                     "base",
@@ -72237,14 +67026,14 @@
                     "factory_install"
                 ],
                 "important": false,
-                "internal": false,
+                "internal": true,
                 "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
                 "master": false,
-                "name": "swanky-full",
-                "overlays": "public",
+                "name": "peppy-release-afdo-generate",
+                "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
                 "paygen": false,
@@ -72253,7 +67042,7 @@
                 "postsync_patch": true,
                 "postsync_reexec": true,
                 "pre_cq": false,
-                "prebuilts": "public",
+                "prebuilts": false,
                 "profile": null,
                 "push_image": false,
                 "push_overlays": null,
@@ -72261,58 +67050,66 @@
                 "rootfs_verification": true,
                 "sanity_check_slaves": null,
                 "shared_user_password": null,
-                "signer_tests": false,
+                "signer_tests": true,
                 "sync_chrome": null,
                 "tests_supported": true,
-                "trybot_list": true,
+                "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": null,
+                "unittests": true,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
-                "upload_symbols": false,
+                "upload_symbols": true,
                 "uprev": true,
                 "use_chrome_lkgm": false,
                 "use_lkgm": false,
                 "use_sdk": true,
-                "useflags": [],
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": []
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
             },
             {
                 "afdo_generate": false,
                 "afdo_generate_min": false,
                 "afdo_update_ebuild": false,
-                "afdo_use": false,
+                "afdo_use": true,
                 "archive": true,
                 "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "winky"
+                    "peppy"
                 ],
                 "branch": false,
                 "build_before_patching": false,
-                "build_packages_in_background": true,
+                "build_packages_in_background": false,
                 "build_tests": true,
-                "build_type": "full",
+                "build_type": "canary",
                 "child_configs": [],
                 "chrome_binhost_only": false,
                 "chrome_rev": null,
                 "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_build_chrome": true,
                 "chrome_sdk_goma": false,
-                "chromeos_official": false,
+                "chromeos_official": true,
                 "chroot_replace": true,
                 "compilecheck": false,
                 "cpe_export": true,
                 "create_delta_sysroot": false,
                 "critical_for_chrome": false,
                 "debug_symbols": true,
-                "description": "Full Builds",
+                "description": "Release Builds (canary) (internal)",
                 "dev_installer_prebuilts": false,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
@@ -72320,13 +67117,20 @@
                 "factory_install_netboot": true,
                 "factory_toolkit": true,
                 "gcc_githash": null,
-                "git_sync": true,
+                "git_sync": false,
                 "grouped": true,
                 "gs_path": "default",
                 "health_alert_recipients": [],
                 "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
                 "image_test": true,
                 "images": [
                     "base",
@@ -72334,14 +67138,14 @@
                     "factory_install"
                 ],
                 "important": false,
-                "internal": false,
+                "internal": true,
                 "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
                 "master": false,
-                "name": "winky-full",
-                "overlays": "public",
+                "name": "peppy-release-afdo-use",
+                "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
                 "paygen": false,
@@ -72350,7 +67154,7 @@
                 "postsync_patch": true,
                 "postsync_reexec": true,
                 "pre_cq": false,
-                "prebuilts": "public",
+                "prebuilts": false,
                 "profile": null,
                 "push_image": false,
                 "push_overlays": null,
@@ -72358,121 +67162,32 @@
                 "rootfs_verification": true,
                 "sanity_check_slaves": null,
                 "shared_user_password": null,
-                "signer_tests": false,
+                "signer_tests": true,
                 "sync_chrome": null,
                 "tests_supported": true,
-                "trybot_list": true,
+                "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": null,
+                "unittests": true,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
-                "upload_symbols": false,
+                "upload_symbols": true,
                 "uprev": true,
                 "use_chrome_lkgm": false,
                 "use_lkgm": false,
                 "use_sdk": true,
-                "useflags": [],
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": false,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
-                "board_replace": false,
-                "boards": [
-                    "candy"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "full",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": false,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Full Builds",
-                "dev_installer_prebuilts": false,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": true,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": false,
-                "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
-                "master": false,
-                "name": "candy-full",
-                "overlays": "public",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": false,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": "public",
-                "profile": null,
-                "push_image": false,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": false,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": false,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
             }
         ],
         "chrome_binhost_only": false,
@@ -72480,14 +67195,14 @@
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds; Group config (boards: squawks, swanky, winky, candy)",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -72495,13 +67210,20 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
         "image_test": true,
         "images": [
             "base",
@@ -72509,14 +67231,14 @@
             "factory_install"
         ],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "rambi-c-full-group",
-        "overlays": "public",
+        "name": "peppy-release-afdo",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -72525,7 +67247,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -72533,28 +67255,146 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": [
-            "pfq_suite"
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
         ]
     },
-    "rambi-c-release-group": {
+    "peppy-release-afdo-generate": {
+        "afdo_generate": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "peppy"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "peppy-release-afdo-generate",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
+    },
+    "peppy-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -72566,283 +67406,369 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "squawks"
+            "peppy"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
         "build_type": "canary",
-        "child_configs": [
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "squawks"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": false,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": true,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "squawks-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": true,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "swanky"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
-                "image_test": true,
-                "images": [
-                    "base",
-                    "test",
-                    "factory_install"
-                ],
-                "important": false,
-                "internal": true,
-                "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
-                "master": false,
-                "name": "swanky-release",
-                "overlays": "both",
-                "packages": [],
-                "paladin_builder_name": null,
-                "paygen": true,
-                "paygen_skip_delta_payloads": false,
-                "paygen_skip_testing": false,
-                "postsync_patch": true,
-                "postsync_reexec": true,
-                "pre_cq": false,
-                "prebuilts": false,
-                "profile": null,
-                "push_image": true,
-                "push_overlays": null,
-                "quick_unit": false,
-                "rootfs_verification": true,
-                "sanity_check_slaves": null,
-                "shared_user_password": null,
-                "signer_tests": true,
-                "sync_chrome": null,
-                "tests_supported": true,
-                "trybot_list": true,
-                "unittest_blacklist": [],
-                "unittests": null,
-                "upload_hw_test_artifacts": true,
-                "upload_standalone_images": true,
-                "upload_symbols": true,
-                "uprev": true,
-                "use_chrome_lkgm": false,
-                "use_lkgm": false,
-                "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi",
-                    "highdpi"
-                ],
-                "usepkg_build_packages": false,
-                "usepkg_toolchain": false,
-                "vm_test_runs": 1,
-                "vm_tests": []
-            },
-            {
-                "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
-                "afdo_use": true,
-                "archive": true,
-                "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
-                "board_replace": false,
-                "boards": [
-                    "winky"
-                ],
-                "branch": false,
-                "build_before_patching": false,
-                "build_packages_in_background": true,
-                "build_tests": true,
-                "build_type": "canary",
-                "child_configs": [],
-                "chrome_binhost_only": false,
-                "chrome_rev": null,
-                "chrome_sdk": true,
-                "chrome_sdk_build_chrome": false,
-                "chrome_sdk_goma": false,
-                "chromeos_official": true,
-                "chroot_replace": true,
-                "compilecheck": false,
-                "cpe_export": true,
-                "create_delta_sysroot": false,
-                "critical_for_chrome": false,
-                "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
-                "dev_manifest": "default.xml",
-                "disk_layout": null,
-                "do_not_apply_cq_patches": false,
-                "factory_install_netboot": true,
-                "factory_toolkit": true,
-                "gcc_githash": null,
-                "git_sync": false,
-                "grouped": true,
-                "gs_path": "default",
-                "health_alert_recipients": [],
-                "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "peppy-release-afdo-use",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
+    },
+    "peppy-tot-chrome-pfq-informational": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "peppy"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Informational Chrome Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": false,
+        "master": false,
+        "name": "peppy-tot-chrome-pfq-informational",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": true,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite"
+        ]
+    },
+    "peppy-tot-chromium-pfq-informational": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "peppy"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Informational Chromium Uprev & Build (public)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "peppy-tot-chromium-pfq-informational",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": true,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite"
+        ]
+    },
+    "pineview-full-group": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "x86-mario"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "full",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "x86-mario"
                 ],
-                "hwqual": true,
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
                 "image_test": true,
                 "images": [
                     "base",
@@ -72850,105 +67776,98 @@
                     "factory_install"
                 ],
                 "important": false,
-                "internal": true,
+                "internal": false,
                 "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
                 "master": false,
-                "name": "winky-release",
-                "overlays": "both",
+                "name": "x86-mario-full",
+                "overlays": "public",
                 "packages": [],
                 "paladin_builder_name": null,
-                "paygen": true,
+                "paygen": false,
                 "paygen_skip_delta_payloads": false,
                 "paygen_skip_testing": false,
                 "postsync_patch": true,
                 "postsync_reexec": true,
                 "pre_cq": false,
-                "prebuilts": false,
+                "prebuilts": "public",
                 "profile": null,
-                "push_image": true,
+                "push_image": false,
                 "push_overlays": null,
                 "quick_unit": false,
                 "rootfs_verification": true,
                 "sanity_check_slaves": null,
                 "shared_user_password": null,
-                "signer_tests": true,
+                "signer_tests": false,
                 "sync_chrome": null,
                 "tests_supported": true,
                 "trybot_list": true,
                 "unittest_blacklist": [],
-                "unittests": null,
+                "unittests": true,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
-                "upload_symbols": true,
+                "upload_symbols": false,
                 "uprev": true,
                 "use_chrome_lkgm": false,
                 "use_lkgm": false,
                 "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
+                "useflags": [],
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": []
+                "vm_tests": [
+                    "pfq_suite"
+                ]
             },
             {
                 "afdo_generate": false,
                 "afdo_generate_min": false,
                 "afdo_update_ebuild": false,
-                "afdo_use": true,
+                "afdo_use": false,
                 "archive": true,
                 "archive_build_debug": true,
-                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-                "binhost_bucket": "gs://chromeos-dev-installer",
-                "binhost_key": "RELEASE_BINHOST",
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
                 "board_replace": false,
                 "boards": [
-                    "candy"
+                    "x86-alex"
                 ],
                 "branch": false,
                 "build_before_patching": false,
                 "build_packages_in_background": true,
                 "build_tests": true,
-                "build_type": "canary",
+                "build_type": "full",
                 "child_configs": [],
                 "chrome_binhost_only": false,
                 "chrome_rev": null,
                 "chrome_sdk": true,
                 "chrome_sdk_build_chrome": false,
                 "chrome_sdk_goma": false,
-                "chromeos_official": true,
+                "chromeos_official": false,
                 "chroot_replace": true,
                 "compilecheck": false,
                 "cpe_export": true,
                 "create_delta_sysroot": false,
                 "critical_for_chrome": false,
                 "debug_symbols": true,
-                "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
                 "do_not_apply_cq_patches": false,
                 "factory_install_netboot": true,
                 "factory_toolkit": true,
                 "gcc_githash": null,
-                "git_sync": false,
+                "git_sync": true,
                 "grouped": true,
                 "gs_path": "default",
                 "health_alert_recipients": [],
                 "health_threshold": 0,
-                "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-                ],
-                "hwqual": true,
+                "hw_tests": [],
+                "hwqual": false,
                 "image_test": true,
                 "images": [
                     "base",
@@ -72956,31 +67875,31 @@
                     "factory_install"
                 ],
                 "important": false,
-                "internal": true,
+                "internal": false,
                 "latest_toolchain": false,
-                "manifest": "official.xml",
-                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-                "manifest_version": true,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
                 "master": false,
-                "name": "candy-release",
-                "overlays": "both",
+                "name": "x86-alex-full",
+                "overlays": "public",
                 "packages": [],
                 "paladin_builder_name": null,
-                "paygen": true,
+                "paygen": false,
                 "paygen_skip_delta_payloads": false,
                 "paygen_skip_testing": false,
                 "postsync_patch": true,
                 "postsync_reexec": true,
                 "pre_cq": false,
-                "prebuilts": false,
+                "prebuilts": "public",
                 "profile": null,
-                "push_image": true,
+                "push_image": false,
                 "push_overlays": null,
                 "quick_unit": false,
                 "rootfs_verification": true,
                 "sanity_check_slaves": null,
                 "shared_user_password": null,
-                "signer_tests": true,
+                "signer_tests": false,
                 "sync_chrome": null,
                 "tests_supported": true,
                 "trybot_list": true,
@@ -72988,36 +67907,7688 @@
                 "unittests": null,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
-                "upload_symbols": true,
+                "upload_symbols": false,
                 "uprev": true,
                 "use_chrome_lkgm": false,
                 "use_lkgm": false,
                 "use_sdk": true,
-                "useflags": [
-                    "chrome_internal",
-                    "-cros-debug",
-                    "-highdpi"
-                ],
+                "useflags": [],
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
                 "vm_tests": []
-            }
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "x86-zgb"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "x86-zgb-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "x86-alex_he"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": false,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "x86-alex_he-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "x86-zgb_he"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": false,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "x86-zgb_he-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Full Builds; Group config (boards: x86-mario, x86-alex, x86-zgb, x86-alex_he, x86-zgb_he)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "pineview-full-group",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "pineview-release-group": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": true,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "x86-mario"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "x86-mario"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "x86-mario-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "x86-alex"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "x86-alex-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "x86-zgb"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "x86-zgb-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "x86-alex_he"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": false,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "x86-alex_he-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": true,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": false,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "x86-zgb_he"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": false,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "x86-zgb_he-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": true,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": false,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal); Group config (boards: x86-mario, x86-alex, x86-zgb, x86-alex_he, x86-zgb_he)",
+        "dev_installer_prebuilts": true,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": true,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "pineview-release-group",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": true,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
+    },
+    "pre-cq-group": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": false,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "rambi"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": true,
+        "build_tests": true,
+        "build_type": "binary",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": false,
+                "archive_build_debug": false,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "rambi"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "binary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": false,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": false,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": false,
+                "description": "Verifies compilation, vm/unit tests, and building an image",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": false,
+                "images": [
+                    "test"
+                ],
+                "important": true,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "rambi-pre-cq",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": true,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": false,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal"
+                ],
+                "usepkg_build_packages": true,
+                "usepkg_toolchain": true,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": false,
+                "archive_build_debug": false,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "daisy_spring"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "binary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": false,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": true,
+                "cpe_export": false,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": false,
+                "description": "Verifies compilation only",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": false,
+                "images": [
+                    "test"
+                ],
+                "important": true,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "daisy_spring-pre-cq",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": true,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": false,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": false,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal"
+                ],
+                "usepkg_build_packages": true,
+                "usepkg_toolchain": true,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": false,
+                "archive_build_debug": false,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "duck"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "binary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": false,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": true,
+                "cpe_export": false,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": false,
+                "description": "Verifies compilation only",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": false,
+                "images": [
+                    "test"
+                ],
+                "important": true,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "duck-pre-cq",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": true,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": false,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": false,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal"
+                ],
+                "usepkg_build_packages": true,
+                "usepkg_toolchain": true,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": false,
+                "archive_build_debug": false,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "samus"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "binary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": false,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": true,
+                "cpe_export": false,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": false,
+                "description": "Verifies compilation only",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": false,
+                "images": [
+                    "test"
+                ],
+                "important": true,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "samus-pre-cq",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": true,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": false,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal"
+                ],
+                "usepkg_build_packages": true,
+                "usepkg_toolchain": true,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": false,
+                "archive_build_debug": false,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "lumpy"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "binary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": false,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": true,
+                "cpe_export": false,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": false,
+                "description": "Verifies compilation only",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": false,
+                "images": [
+                    "test"
+                ],
+                "important": true,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "lumpy-pre-cq",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": true,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": false,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal"
+                ],
+                "usepkg_build_packages": true,
+                "usepkg_toolchain": true,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": false,
+                "archive_build_debug": false,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "parrot"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "binary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": false,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": true,
+                "cpe_export": false,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": false,
+                "description": "Verifies compilation only",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": false,
+                "images": [
+                    "test"
+                ],
+                "important": true,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "parrot-pre-cq",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": true,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": false,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": false,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal"
+                ],
+                "usepkg_build_packages": true,
+                "usepkg_toolchain": true,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite"
+                ]
+            }
+        ],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": false,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": false,
+        "description": "Verifies compilation, vm/unit tests, and building an image",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": true,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "pre-cq-group",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": true,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite"
+        ]
+    },
+    "pre-cq-launcher": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "priest",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Launcher for Pre-CQ builders",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [
+            "chromeos-build-alerts@google.com",
+            "tree",
+            "build"
+        ],
+        "health_threshold": 1,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": true,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": false,
+        "master": false,
+        "name": "pre-cq-launcher",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "quawks-chrome-pfq": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "quawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Preflight Chrome Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "quawks-chrome-pfq",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "quawks-chromium-pfq": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "quawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Preflight Chromium Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "quawks-chromium-pfq",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "quawks-depthcharge-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "quawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "quawks-depthcharge-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "depthcharge"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "quawks-depthcharge-full-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "quawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "full",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Informational",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": false,
+        "master": false,
+        "name": "quawks-depthcharge-full-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "depthcharge"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "quawks-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "quawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "quawks-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "quawks-full": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "quawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "full",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Full Builds",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "quawks-full",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "quawks-paladin": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "quawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "paladin",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Commit Queue (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "quawks-paladin",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": "quawks paladin",
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "quawks-payloads": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "quawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "payloads",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": false,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Regenerate release payloads.",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "quawks-payloads",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": true,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "quawks-release": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": true,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "quawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "quawks-release",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": true,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi",
+            "highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
+    },
+    "quawks-release-afdo": {
+        "afdo_generate": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "quawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": true,
+                "afdo_update_ebuild": true,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "quawks"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "quawks-release-afdo-generate",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "quawks"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "quawks-release-afdo-use",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": false,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
+            }
+        ],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "quawks-release-afdo",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
+    },
+    "quawks-release-afdo-generate": {
+        "afdo_generate": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "quawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "quawks-release-afdo-generate",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
+    },
+    "quawks-release-afdo-use": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": true,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "quawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "quawks-release-afdo-use",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
+    },
+    "quawks-tot-chrome-pfq-informational": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "quawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Informational Chrome Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": false,
+        "master": false,
+        "name": "quawks-tot-chrome-pfq-informational",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": true,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite"
+        ]
+    },
+    "quawks-tot-chromium-pfq-informational": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "quawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Informational Chromium Uprev & Build (public)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "quawks-tot-chromium-pfq-informational",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": true,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite"
+        ]
+    },
+    "rambi-a-full-group": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "rambi"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "full",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "rambi"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "rambi-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "pfq_suite"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "clapper"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "clapper-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "enguarde"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "enguarde-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "expresso"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "expresso-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Full Builds; Group config (boards: rambi, clapper, enguarde, expresso)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "rambi-a-full-group",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "rambi-a-release-group": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": true,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "rambi"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "rambi"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "rambi-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "clapper"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "clapper-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "enguarde"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "enguarde-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "expresso"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "expresso-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal); Group config (boards: rambi, clapper, enguarde, expresso)",
+        "dev_installer_prebuilts": true,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": true,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "rambi-a-release-group",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": true,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
+    },
+    "rambi-b-full-group": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "glimmer"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "full",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "glimmer"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "glimmer-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "pfq_suite"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "gnawty"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "gnawty-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "kip"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "kip-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "quawks"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "quawks-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Full Builds; Group config (boards: glimmer, gnawty, kip, quawks)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "rambi-b-full-group",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "rambi-b-release-group": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": true,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "glimmer"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "glimmer"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "glimmer-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "gnawty"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "gnawty-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "kip"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "kip-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "quawks"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "quawks-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi",
+                    "highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal); Group config (boards: glimmer, gnawty, kip, quawks)",
+        "dev_installer_prebuilts": true,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": true,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "rambi-b-release-group",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": true,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
+    },
+    "rambi-c-full-group": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "squawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "full",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "squawks"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "squawks-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "pfq_suite"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "swanky"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "swanky-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "winky"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "winky-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "candy"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "candy-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Full Builds; Group config (boards: squawks, swanky, winky, candy)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "rambi-c-full-group",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "rambi-c-release-group": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": true,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "squawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "squawks"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "squawks-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "swanky"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "swanky-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi",
+                    "highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "winky"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "winky-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "candy"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "candy-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            }
+        ],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal); Group config (boards: squawks, swanky, winky, candy)",
+        "dev_installer_prebuilts": true,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": true,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "rambi-c-release-group",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": true,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
+    },
+    "rambi-chrome-pfq": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "rambi"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Preflight Chrome Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "rambi-chrome-pfq",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "rambi-chromium-pfq": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "rambi"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Preflight Chromium Uprev & Build (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "rambi-chromium-pfq",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "rambi-d-full-group": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "cranky"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "full",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": false,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
+                    "cranky"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "cranky-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "pfq_suite"
+                ]
+            }
+        ],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Full Builds; Group config (boards: cranky)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "rambi-d-full-group",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "rambi-d-release-group": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": true,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "cranky"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [
+            {
+                "afdo_generate": false,
+                "afdo_generate_min": false,
+                "afdo_update_ebuild": false,
+                "afdo_use": true,
+                "archive": true,
+                "archive_build_debug": true,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
+                    "cranky"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": false,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": true,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
+                "image_test": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "cranky-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "paygen_skip_delta_payloads": false,
+                "paygen_skip_testing": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "tests_supported": true,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": true,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_toolchain": false,
+                "vm_test_runs": 1,
+                "vm_tests": [
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
+                ]
+            }
+        ],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal); Group config (boards: cranky)",
+        "dev_installer_prebuilts": true,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "rambi-d-release-group",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": true,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
+    },
+    "rambi-depthcharge-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "rambi"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "rambi-depthcharge-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "depthcharge"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "rambi-depthcharge-full-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "rambi"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "full",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Informational",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": false,
+        "master": false,
+        "name": "rambi-depthcharge-full-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "depthcharge"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "rambi-firmware": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "rambi"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Firmware Canary",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": true,
+        "image_test": false,
+        "images": [],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "rambi-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "rambi-full": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "rambi"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "full",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Full Builds",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "rambi-full",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "pfq_suite"
+        ]
+    },
+    "rambi-paladin": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "rambi"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "paladin",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Commit Queue (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": true,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "rambi-paladin",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": "rambi paladin",
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "rambi-payloads": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "rambi"
         ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "payloads",
+        "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
-        "chroot_replace": true,
+        "chromeos_official": false,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal); Group config (boards: squawks, swanky, winky, candy)",
-        "dev_installer_prebuilts": true,
+        "description": "Regenerate release payloads.",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -73029,27 +75600,20 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
-        "hwqual": true,
-        "image_test": true,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rambi-c-release-group",
+        "name": "rambi-payloads",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -73061,45 +75625,37 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
-        "upload_symbols": true,
+        "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "rambi-chrome-pfq": {
+    "rambi-pre-cq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
-        "archive": true,
+        "archive": false,
         "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
@@ -73110,23 +75666,23 @@
         ],
         "branch": false,
         "build_before_patching": false,
-        "build_packages_in_background": false,
+        "build_packages_in_background": true,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "binary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
-        "cpe_export": true,
+        "cpe_export": false,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "debug_symbols": false,
+        "description": "Verifies compilation, vm/unit tests, and building an image",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -73145,14 +75701,14 @@
         "images": [
             "test"
         ],
-        "important": false,
+        "important": true,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rambi-chrome-pfq",
+        "name": "rambi-pre-cq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -73161,8 +75717,8 @@
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "private",
+        "pre_cq": true,
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -73173,13 +75729,13 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -73190,19 +75746,19 @@
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": [
-            "pfq_suite"
+            "smoke_suite"
         ]
     },
-    "rambi-chromium-pfq": {
+    "rambi-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
             "rambi"
@@ -73211,22 +75767,22 @@
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
-        "dev_installer_prebuilts": false,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -73238,111 +75794,124 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": false,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rambi-chromium-pfq",
+        "name": "rambi-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": false,
+        "trybot_list": true,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
+        "upload_symbols": true,
+        "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": [
-            "pfq_suite"
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
         ]
     },
-    "rambi-d-full-group": {
+    "rambi-release-afdo": {
         "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
         "afdo_use": false,
         "archive": true,
         "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "cranky"
+            "rambi"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "canary",
         "child_configs": [
             {
                 "afdo_generate": false,
-                "afdo_generate_min": false,
-                "afdo_update_ebuild": false,
+                "afdo_generate_min": true,
+                "afdo_update_ebuild": true,
                 "afdo_use": false,
                 "archive": true,
                 "archive_build_debug": true,
-                "binhost_base_url": null,
-                "binhost_bucket": null,
-                "binhost_key": null,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "cranky"
+                    "rambi"
                 ],
                 "branch": false,
                 "build_before_patching": false,
                 "build_packages_in_background": false,
                 "build_tests": true,
-                "build_type": "full",
+                "build_type": "canary",
                 "child_configs": [],
                 "chrome_binhost_only": false,
                 "chrome_rev": null,
                 "chrome_sdk": true,
                 "chrome_sdk_build_chrome": true,
                 "chrome_sdk_goma": false,
-                "chromeos_official": false,
+                "chromeos_official": true,
                 "chroot_replace": true,
                 "compilecheck": false,
                 "cpe_export": true,
                 "create_delta_sysroot": false,
                 "critical_for_chrome": false,
                 "debug_symbols": true,
-                "description": "Full Builds",
+                "description": "Release Builds (canary) (internal)",
                 "dev_installer_prebuilts": false,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
@@ -73350,13 +75919,20 @@
                 "factory_install_netboot": true,
                 "factory_toolkit": true,
                 "gcc_githash": null,
-                "git_sync": true,
+                "git_sync": false,
                 "grouped": true,
                 "gs_path": "default",
                 "health_alert_recipients": [],
                 "health_threshold": 0,
-                "hw_tests": [],
-                "hwqual": false,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+                ],
+                "hwqual": true,
                 "image_test": true,
                 "images": [
                     "base",
@@ -73364,14 +75940,14 @@
                     "factory_install"
                 ],
                 "important": false,
-                "internal": false,
+                "internal": true,
                 "latest_toolchain": false,
-                "manifest": "default.xml",
-                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-                "manifest_version": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
                 "master": false,
-                "name": "cranky-full",
-                "overlays": "public",
+                "name": "rambi-release-afdo-generate",
+                "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
                 "paygen": false,
@@ -73380,7 +75956,7 @@
                 "postsync_patch": true,
                 "postsync_reexec": true,
                 "pre_cq": false,
-                "prebuilts": "public",
+                "prebuilts": false,
                 "profile": null,
                 "push_image": false,
                 "push_overlays": null,
@@ -73388,127 +75964,33 @@
                 "rootfs_verification": true,
                 "sanity_check_slaves": null,
                 "shared_user_password": null,
-                "signer_tests": false,
+                "signer_tests": true,
                 "sync_chrome": null,
                 "tests_supported": true,
-                "trybot_list": true,
+                "trybot_list": false,
                 "unittest_blacklist": [],
                 "unittests": true,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
-                "upload_symbols": false,
+                "upload_symbols": true,
                 "uprev": true,
                 "use_chrome_lkgm": false,
                 "use_lkgm": false,
                 "use_sdk": true,
-                "useflags": [],
+                "useflags": [
+                    "chrome_internal",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
                 "vm_tests": [
-                    "pfq_suite"
+                    "smoke_suite",
+                    "dev_mode_test",
+                    "cros_vm_test"
                 ]
-            }
-        ],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Full Builds; Group config (boards: cranky)",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": true,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": false,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
-        "master": false,
-        "name": "rambi-d-full-group",
-        "overlays": "public",
-        "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "public",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
-        "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": true,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
-        "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
-    },
-    "rambi-d-release-group": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": true,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
-        "board_replace": false,
-        "boards": [
-            "cranky"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "canary",
-        "child_configs": [
+            },
             {
                 "afdo_generate": false,
                 "afdo_generate_min": false,
@@ -73521,7 +76003,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "cranky"
+                    "rambi"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -73542,7 +76024,7 @@
                 "critical_for_chrome": false,
                 "debug_symbols": true,
                 "description": "Release Builds (canary) (internal)",
-                "dev_installer_prebuilts": true,
+                "dev_installer_prebuilts": false,
                 "dev_manifest": "default.xml",
                 "disk_layout": null,
                 "do_not_apply_cq_patches": false,
@@ -73555,10 +76037,12 @@
                 "health_alert_recipients": [],
                 "health_threshold": 0,
                 "hw_tests": [
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+                    "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
                 ],
                 "hwqual": true,
                 "image_test": true,
@@ -73574,11 +76058,11 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "cranky-release",
+                "name": "rambi-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
-                "paygen": true,
+                "paygen": false,
                 "paygen_skip_delta_payloads": false,
                 "paygen_skip_testing": false,
                 "postsync_patch": true,
@@ -73586,7 +76070,7 @@
                 "pre_cq": false,
                 "prebuilts": false,
                 "profile": null,
-                "push_image": true,
+                "push_image": false,
                 "push_overlays": null,
                 "quick_unit": false,
                 "rootfs_verification": true,
@@ -73595,7 +76079,7 @@
                 "signer_tests": true,
                 "sync_chrome": null,
                 "tests_supported": true,
-                "trybot_list": true,
+                "trybot_list": false,
                 "unittest_blacklist": [],
                 "unittests": true,
                 "upload_hw_test_artifacts": true,
@@ -73632,8 +76116,8 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal); Group config (boards: cranky)",
-        "dev_installer_prebuilts": true,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
@@ -73646,10 +76130,12 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
         ],
         "hwqual": true,
         "image_test": true,
@@ -73658,18 +76144,18 @@
             "test",
             "factory_install"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
         "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rambi-d-release-group",
+        "name": "rambi-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -73677,7 +76163,7 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
@@ -73686,7 +76172,119 @@
         "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
+    },
+    "rambi-release-afdo-generate": {
+        "afdo_generate": false,
+        "afdo_generate_min": true,
+        "afdo_update_ebuild": true,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "rambi"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "rambi-release-afdo-generate",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": true,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
@@ -73710,11 +76308,11 @@
             "cros_vm_test"
         ]
     },
-    "rambi-depthcharge-firmware": {
+    "rambi-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
-        "afdo_use": false,
+        "afdo_use": true,
         "archive": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
@@ -73727,12 +76325,12 @@
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
+        "build_tests": true,
         "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": true,
@@ -73742,35 +76340,44 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Canary",
+        "description": "Release Builds (canary) (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [],
+        "hw_tests": [
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 4,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"pyauto_perf\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}",
+            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": false,\n    \"minimum_duts\": 0,\n    \"num\": 1,\n    \"pool\": \"chromeperf\",\n    \"priority\": \"Build\",\n    \"retry\": false,\n    \"suite\": \"perf_v2\",\n    \"timeout\": 7200,\n    \"warn_only\": false\n}"
+        ],
         "hwqual": true,
-        "image_test": false,
-        "images": [],
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rambi-depthcharge-firmware",
+        "name": "rambi-release-afdo-use",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -73780,40 +76387,46 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": false,
+        "signer_tests": true,
+        "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
-        "upload_symbols": false,
+        "upload_symbols": true,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [
-            "depthcharge"
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
         ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite",
+            "dev_mode_test",
+            "cros_vm_test"
+        ]
     },
-    "rambi-depthcharge-full-firmware": {
+    "rambi-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
@@ -73824,30 +76437,30 @@
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "full",
+        "build_tests": true,
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "tot",
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Informational",
+        "description": "Informational Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
@@ -73855,7 +76468,9 @@
         "hw_tests": [],
         "hwqual": false,
         "image_test": false,
-        "images": [],
+        "images": [
+            "test"
+        ],
         "important": false,
         "internal": true,
         "latest_toolchain": false,
@@ -73863,11 +76478,9 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "rambi-depthcharge-full-firmware",
+        "name": "rambi-tot-chrome-pfq-informational",
         "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -73884,36 +76497,38 @@
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
+        "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
         "useflags": [
-            "depthcharge"
+            "chrome_internal"
         ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite"
+        ]
     },
-    "rambi-firmware": {
+    "rambi-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
-        "binhost_bucket": "gs://chromeos-dev-installer",
-        "binhost_key": "RELEASE_BINHOST",
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
         "board_replace": false,
         "boards": [
             "rambi"
@@ -73921,28 +76536,28 @@
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": false,
-        "build_type": "canary",
+        "build_tests": true,
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "tot",
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Firmware Canary",
+        "description": "Informational Chromium Uprev & Build (public)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": false,
+        "factory_toolkit": true,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -73950,21 +76565,21 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": true,
+        "hwqual": false,
         "image_test": false,
-        "images": [],
+        "images": [
+            "test"
+        ],
         "important": false,
-        "internal": true,
+        "internal": false,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "rambi-firmware",
-        "overlays": "both",
-        "packages": [
-            "virtual/chromeos-firmware"
-        ],
+        "name": "rambi-tot-chromium-pfq-informational",
+        "overlays": "public",
+        "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -73974,68 +76589,67 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": true,
+        "push_image": false,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": false,
+        "sync_chrome": null,
         "tests_supported": true,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": false,
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
-        "use_lkgm": false,
+        "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal",
-            "-cros-debug",
-            "-highdpi"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": []
+        "vm_tests": [
+            "smoke_suite"
+        ]
     },
-    "rambi-full": {
+    "refresh-packages": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": true,
+        "archive_build_debug": false,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "rambi"
+            "x86-generic",
+            "arm-generic"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "full",
+        "build_type": "refresh_packages",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
+        "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": true,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds",
+        "description": "Check upstream Gentoo for package updates",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -74043,18 +76657,16 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": true,
+        "git_sync": false,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": true,
+        "image_test": false,
         "images": [
-            "base",
-            "test",
-            "factory_install"
+            "test"
         ],
         "important": false,
         "internal": false,
@@ -74063,7 +76675,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "rambi-full",
+        "name": "refresh-packages",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -74073,7 +76685,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -74084,7 +76696,7 @@
         "signer_tests": false,
         "sync_chrome": null,
         "tests_supported": true,
-        "trybot_list": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
         "unittests": true,
         "upload_hw_test_artifacts": true,
@@ -74095,14 +76707,14 @@
         "use_lkgm": false,
         "use_sdk": true,
         "useflags": [],
-        "usepkg_build_packages": false,
-        "usepkg_toolchain": false,
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": [
             "pfq_suite"
         ]
     },
-    "rambi-paladin": {
+    "rush-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -74114,27 +76726,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "rambi"
+            "rush"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
+        "chrome_rev": "latest_release",
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue (internal)",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -74153,17 +76765,17 @@
         "images": [
             "test"
         ],
-        "important": true,
+        "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rambi-paladin",
+        "name": "rush-chrome-pfq",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "rambi paladin",
+        "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
@@ -74180,14 +76792,14 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
-        "trybot_list": true,
+        "tests_supported": false,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -74199,7 +76811,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "rambi-payloads": {
+    "rush-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -74211,27 +76823,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "rambi"
+            "rush"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "payloads",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": false,
+        "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Regenerate release payloads.",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -74257,17 +76869,17 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rambi-payloads",
+        "name": "rush-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -74277,14 +76889,14 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": false,
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
@@ -74294,39 +76906,39 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "rambi-pre-cq": {
+    "rush-full": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
-        "archive": false,
-        "archive_build_debug": false,
+        "archive": true,
+        "archive_build_debug": true,
         "binhost_base_url": null,
         "binhost_bucket": null,
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "rambi"
+            "rush"
         ],
         "branch": false,
         "build_before_patching": false,
-        "build_packages_in_background": true,
+        "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "binary",
+        "build_type": "full",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": false,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
-        "cpe_export": false,
+        "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
-        "debug_symbols": false,
-        "description": "Verifies compilation, vm/unit tests, and building an image",
+        "debug_symbols": true,
+        "description": "Full Builds",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -74334,26 +76946,28 @@
         "factory_install_netboot": true,
         "factory_toolkit": true,
         "gcc_githash": null,
-        "git_sync": false,
+        "git_sync": true,
         "grouped": false,
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
         "hwqual": false,
-        "image_test": false,
+        "image_test": true,
         "images": [
-            "test"
+            "base",
+            "test",
+            "factory_install"
         ],
-        "important": true,
-        "internal": true,
+        "important": false,
+        "internal": false,
         "latest_toolchain": false,
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "manifest_version": true,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
         "master": false,
-        "name": "rambi-pre-cq",
-        "overlays": "both",
+        "name": "rush-full",
+        "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -74361,8 +76975,8 @@
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
-        "pre_cq": true,
-        "prebuilts": false,
+        "pre_cq": false,
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -74372,28 +76986,24 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "useflags": [],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "rambi-release": {
+    "rush-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -74405,7 +77015,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "rambi"
+            "rush"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -74438,12 +77048,7 @@
         "gs_path": "default",
         "health_alert_recipients": [],
         "health_threshold": 0,
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": true,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"Build\",\n    \"retry\": true,\n    \"suite\": \"au\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-cq\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"file_bugs\": true,\n    \"minimum_duts\": 4,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"PostBuild\",\n    \"retry\": false,\n    \"suite\": \"bvt-perbuild\",\n    \"timeout\": 13200,\n    \"warn_only\": false\n}"
-        ],
+        "hw_tests": [],
         "hwqual": true,
         "image_test": true,
         "images": [
@@ -74458,11 +77063,11 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rambi-release",
+        "name": "rush-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": true,
+        "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -74476,12 +77081,12 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": true,
+        "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": true,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -74497,13 +77102,9 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "rambi-release-afdo": {
+    "rush-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -74515,7 +77116,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "rambi"
+            "rush"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -74535,7 +77136,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "rambi"
+                    "rush"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -74590,7 +77191,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "rambi-release-afdo-generate",
+                "name": "rush-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -74610,10 +77211,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": true,
+                "tests_supported": false,
                 "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": true,
+                "unittests": false,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -74629,11 +77230,7 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
+                "vm_tests": []
             },
             {
                 "afdo_generate": false,
@@ -74647,7 +77244,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "rambi"
+                    "rush"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -74702,7 +77299,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "rambi-release-afdo-use",
+                "name": "rush-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -74722,10 +77319,10 @@
                 "shared_user_password": null,
                 "signer_tests": true,
                 "sync_chrome": null,
-                "tests_supported": true,
+                "tests_supported": false,
                 "trybot_list": false,
                 "unittest_blacklist": [],
-                "unittests": true,
+                "unittests": false,
                 "upload_hw_test_artifacts": true,
                 "upload_standalone_images": true,
                 "upload_symbols": true,
@@ -74741,11 +77338,7 @@
                 "usepkg_build_packages": false,
                 "usepkg_toolchain": false,
                 "vm_test_runs": 1,
-                "vm_tests": [
-                    "smoke_suite",
-                    "dev_mode_test",
-                    "cros_vm_test"
-                ]
+                "vm_tests": []
             }
         ],
         "chrome_binhost_only": false,
@@ -74795,7 +77388,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rambi-release-afdo",
+        "name": "rush-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -74815,10 +77408,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -74834,13 +77427,9 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "rambi-release-afdo-generate": {
+    "rush-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -74852,7 +77441,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "rambi"
+            "rush"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -74907,7 +77496,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rambi-release-afdo-generate",
+        "name": "rush-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -74927,10 +77516,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -74946,13 +77535,9 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "rambi-release-afdo-use": {
+    "rush-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -74964,7 +77549,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "rambi"
+            "rush"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -75019,7 +77604,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rambi-release-afdo-use",
+        "name": "rush-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -75039,10 +77624,10 @@
         "shared_user_password": null,
         "signer_tests": true,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": true,
@@ -75058,13 +77643,9 @@
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite",
-            "dev_mode_test",
-            "cros_vm_test"
-        ]
+        "vm_tests": []
     },
-    "rambi-tot-chrome-pfq-informational": {
+    "rush-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -75076,7 +77657,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "rambi"
+            "rush"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -75122,7 +77703,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "rambi-tot-chrome-pfq-informational",
+        "name": "rush-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -75142,10 +77723,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -75159,11 +77740,9 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "rambi-tot-chromium-pfq-informational": {
+    "rush-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -75175,7 +77754,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "rambi"
+            "rush"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -75221,7 +77800,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "rambi-tot-chromium-pfq-informational",
+        "name": "rush-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -75241,10 +77820,10 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
@@ -75256,11 +77835,9 @@
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
-    "refresh-packages": {
+    "rush_ryu-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -75272,28 +77849,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "x86-generic",
-            "arm-generic"
+            "rush_ryu"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "refresh_packages",
+        "build_type": "chrome",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": false,
+        "chrome_rev": "latest_release",
+        "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Check upstream Gentoo for package updates",
+        "description": "Preflight Chrome Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -75312,15 +77888,15 @@
         "images": [
             "test"
         ],
-        "important": false,
-        "internal": false,
+        "important": true,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "refresh-packages",
-        "overlays": "public",
+        "name": "rush_ryu-chrome-pfq",
+        "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
         "paygen": false,
@@ -75329,7 +77905,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": false,
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -75339,26 +77915,26 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": true,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
+        "unittests": false,
         "upload_hw_test_artifacts": true,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": true,
+        "uprev": false,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal"
+        ],
         "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
+        "usepkg_toolchain": false,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "pfq_suite"
-        ]
+        "vm_tests": []
     },
-    "rush-chrome-pfq": {
+    "rush_ryu-chromium-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -75370,7 +77946,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "rush"
+            "rush_ryu"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -75383,14 +77959,14 @@
         "chrome_sdk": true,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": true,
+        "chromeos_official": false,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chrome Uprev & Build (internal)",
+        "description": "Preflight Chromium Uprev & Build (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -75416,7 +77992,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rush-chrome-pfq",
+        "name": "rush_ryu-chromium-pfq",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -75426,7 +78002,7 @@
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": "public",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -75447,15 +78023,110 @@
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
+        "useflags": [],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "rush_ryu-full": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "rush_ryu"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "full",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": true,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Full Builds",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": true,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
         ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "rush_ryu-full",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "public",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": false,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "rush-chromium-pfq": {
+    "rush_ryu-paladin": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -75467,18 +78138,18 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "rush"
+            "rush_ryu"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "chrome",
+        "build_type": "paladin",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "latest_release",
+        "chrome_rev": null,
         "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_build_chrome": false,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
         "chroot_replace": true,
@@ -75487,7 +78158,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Preflight Chromium Uprev & Build (internal)",
+        "description": "Commit Queue (internal)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -75509,118 +78180,21 @@
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "default.xml",
+        "manifest": "official.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rush-chromium-pfq",
+        "name": "rush_ryu-paladin",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": null,
-        "paygen": false,
-        "paygen_skip_delta_payloads": false,
-        "paygen_skip_testing": false,
-        "postsync_patch": true,
-        "postsync_reexec": true,
-        "pre_cq": false,
-        "prebuilts": "public",
-        "profile": null,
-        "push_image": false,
-        "push_overlays": null,
-        "quick_unit": false,
-        "rootfs_verification": true,
-        "sanity_check_slaves": null,
-        "shared_user_password": null,
-        "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": false,
-        "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
-        "upload_symbols": false,
-        "uprev": false,
-        "use_chrome_lkgm": false,
-        "use_lkgm": false,
-        "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": true,
-        "usepkg_toolchain": true,
-        "vm_test_runs": 1,
-        "vm_tests": []
-    },
-    "rush-full": {
-        "afdo_generate": false,
-        "afdo_generate_min": false,
-        "afdo_update_ebuild": false,
-        "afdo_use": false,
-        "archive": true,
-        "archive_build_debug": true,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
-        "board_replace": false,
-        "boards": [
-            "rush"
-        ],
-        "branch": false,
-        "build_before_patching": false,
-        "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "full",
-        "child_configs": [],
-        "chrome_binhost_only": false,
-        "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": true,
-        "chrome_sdk_goma": false,
-        "chromeos_official": false,
-        "chroot_replace": true,
-        "compilecheck": false,
-        "cpe_export": true,
-        "create_delta_sysroot": false,
-        "critical_for_chrome": false,
-        "debug_symbols": true,
-        "description": "Full Builds",
-        "dev_installer_prebuilts": false,
-        "dev_manifest": "default.xml",
-        "disk_layout": null,
-        "do_not_apply_cq_patches": false,
-        "factory_install_netboot": true,
-        "factory_toolkit": true,
-        "gcc_githash": null,
-        "git_sync": true,
-        "grouped": false,
-        "gs_path": "default",
-        "health_alert_recipients": [],
-        "health_threshold": 0,
-        "hw_tests": [],
-        "hwqual": false,
-        "image_test": true,
-        "images": [
-            "base",
-            "test",
-            "factory_install"
-        ],
-        "important": false,
-        "internal": false,
-        "latest_toolchain": false,
-        "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
-        "master": false,
-        "name": "rush-full",
-        "overlays": "public",
-        "packages": [],
-        "paladin_builder_name": null,
+        "paladin_builder_name": "rush_ryu paladin",
         "paygen": false,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "public",
+        "prebuilts": "private",
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -75635,19 +78209,21 @@
         "unittest_blacklist": [],
         "unittests": false,
         "upload_hw_test_artifacts": true,
-        "upload_standalone_images": true,
+        "upload_standalone_images": false,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
-        "usepkg_build_packages": false,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
         "usepkg_toolchain": false,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "rush-paladin": {
+    "rush_ryu-payloads": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -75659,27 +78235,27 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "rush"
+            "rush_ryu"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
         "build_tests": true,
-        "build_type": "paladin",
+        "build_type": "payloads",
         "child_configs": [],
         "chrome_binhost_only": false,
         "chrome_rev": null,
-        "chrome_sdk": true,
-        "chrome_sdk_build_chrome": false,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
         "chromeos_official": false,
-        "chroot_replace": true,
+        "chroot_replace": false,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Commit Queue (internal)",
+        "description": "Regenerate release payloads.",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -75701,21 +78277,21 @@
         "important": false,
         "internal": true,
         "latest_toolchain": false,
-        "manifest": "official.xml",
+        "manifest": "default.xml",
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rush-paladin",
+        "name": "rush_ryu-payloads",
         "overlays": "both",
         "packages": [],
-        "paladin_builder_name": "rush paladin",
-        "paygen": false,
+        "paladin_builder_name": null,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
         "postsync_reexec": true,
         "pre_cq": false,
-        "prebuilts": "private",
+        "prebuilts": false,
         "profile": null,
         "push_image": false,
         "push_overlays": null,
@@ -75725,26 +78301,24 @@
         "shared_user_password": null,
         "signer_tests": false,
         "sync_chrome": null,
-        "tests_supported": false,
-        "trybot_list": true,
+        "tests_supported": true,
+        "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": false,
-        "upload_hw_test_artifacts": true,
-        "upload_standalone_images": false,
+        "unittests": true,
+        "upload_hw_test_artifacts": false,
+        "upload_standalone_images": true,
         "upload_symbols": false,
         "uprev": true,
         "use_chrome_lkgm": false,
         "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
+        "useflags": [],
         "usepkg_build_packages": true,
-        "usepkg_toolchain": false,
+        "usepkg_toolchain": true,
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "rush-release": {
+    "rush_ryu-release": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -75756,7 +78330,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "rush"
+            "rush_ryu"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -75804,11 +78378,11 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rush-release",
+        "name": "rush_ryu-release",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
-        "paygen": false,
+        "paygen": true,
         "paygen_skip_delta_payloads": false,
         "paygen_skip_testing": false,
         "postsync_patch": true,
@@ -75822,7 +78396,7 @@
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
-        "signer_tests": false,
+        "signer_tests": true,
         "sync_chrome": null,
         "tests_supported": false,
         "trybot_list": true,
@@ -75845,7 +78419,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "rush-release-afdo": {
+    "rush_ryu-release-afdo": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -75857,7 +78431,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "rush"
+            "rush_ryu"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -75877,7 +78451,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "rush"
+                    "rush_ryu"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -75932,7 +78506,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "rush-release-afdo-generate",
+                "name": "rush_ryu-release-afdo-generate",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -75985,7 +78559,7 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
-                    "rush"
+                    "rush_ryu"
                 ],
                 "branch": false,
                 "build_before_patching": false,
@@ -76040,7 +78614,7 @@
                 "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
                 "manifest_version": true,
                 "master": false,
-                "name": "rush-release-afdo-use",
+                "name": "rush_ryu-release-afdo-use",
                 "overlays": "both",
                 "packages": [],
                 "paladin_builder_name": null,
@@ -76129,7 +78703,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rush-release-afdo",
+        "name": "rush_ryu-release-afdo",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -76170,7 +78744,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "rush-release-afdo-generate": {
+    "rush_ryu-release-afdo-generate": {
         "afdo_generate": false,
         "afdo_generate_min": true,
         "afdo_update_ebuild": true,
@@ -76182,7 +78756,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "rush"
+            "rush_ryu"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -76237,7 +78811,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rush-release-afdo-generate",
+        "name": "rush_ryu-release-afdo-generate",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -76278,7 +78852,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "rush-release-afdo-use": {
+    "rush_ryu-release-afdo-use": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -76290,7 +78864,7 @@
         "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "rush"
+            "rush_ryu"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -76345,7 +78919,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": true,
         "master": false,
-        "name": "rush-release-afdo-use",
+        "name": "rush_ryu-release-afdo-use",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -76386,7 +78960,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "rush-tot-chrome-pfq-informational": {
+    "rush_ryu-tot-chrome-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -76398,7 +78972,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "rush"
+            "rush_ryu"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -76444,7 +79018,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "manifest_version": false,
         "master": false,
-        "name": "rush-tot-chrome-pfq-informational",
+        "name": "rush_ryu-tot-chrome-pfq-informational",
         "overlays": "both",
         "packages": [],
         "paladin_builder_name": null,
@@ -76483,7 +79057,7 @@
         "vm_test_runs": 1,
         "vm_tests": []
     },
-    "rush-tot-chromium-pfq-informational": {
+    "rush_ryu-tot-chromium-pfq-informational": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
@@ -76495,7 +79069,7 @@
         "binhost_key": null,
         "board_replace": false,
         "boards": [
-            "rush"
+            "rush_ryu"
         ],
         "branch": false,
         "build_before_patching": false,
@@ -76541,7 +79115,7 @@
         "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
         "manifest_version": false,
         "master": false,
-        "name": "rush-tot-chromium-pfq-informational",
+        "name": "rush_ryu-tot-chromium-pfq-informational",
         "overlays": "public",
         "packages": [],
         "paladin_builder_name": null,
@@ -77374,7 +79948,7 @@
         ],
         "branch": false,
         "build_before_patching": false,
-        "build_packages_in_background": false,
+        "build_packages_in_background": true,
         "build_tests": true,
         "build_type": "binary",
         "child_configs": [],
@@ -77556,7 +80130,8 @@
         "useflags": [
             "chrome_internal",
             "-cros-debug",
-            "-highdpi"
+            "-highdpi",
+            "highdpi"
         ],
         "usepkg_build_packages": false,
         "usepkg_toolchain": false,
@@ -83578,9 +86153,106 @@
         "use_chrome_lkgm": false,
         "use_lkgm": true,
         "use_sdk": true,
-        "useflags": [
-            "chrome_internal"
-        ],
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": [
+            "smoke_suite"
+        ]
+    },
+    "squawks-tot-chromium-pfq-informational": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "squawks"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "chrome",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": "tot",
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Informational Chromium Uprev & Build (public)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": false,
+        "images": [
+            "test"
+        ],
+        "important": false,
+        "internal": false,
+        "latest_toolchain": false,
+        "manifest": "default.xml",
+        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+        "manifest_version": false,
+        "master": false,
+        "name": "squawks-tot-chromium-pfq-informational",
+        "overlays": "public",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": null,
+        "tests_supported": true,
+        "trybot_list": false,
+        "unittest_blacklist": [],
+        "unittests": true,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": false,
+        "uprev": false,
+        "use_chrome_lkgm": false,
+        "use_lkgm": true,
+        "use_sdk": true,
+        "useflags": [],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
@@ -83588,45 +86260,45 @@
             "smoke_suite"
         ]
     },
-    "squawks-tot-chromium-pfq-informational": {
+    "storm-firmware": {
         "afdo_generate": false,
         "afdo_generate_min": false,
         "afdo_update_ebuild": false,
         "afdo_use": false,
         "archive": true,
-        "archive_build_debug": false,
-        "binhost_base_url": null,
-        "binhost_bucket": null,
-        "binhost_key": null,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
         "board_replace": false,
         "boards": [
-            "squawks"
+            "storm"
         ],
         "branch": false,
         "build_before_patching": false,
         "build_packages_in_background": false,
-        "build_tests": true,
-        "build_type": "chrome",
+        "build_tests": false,
+        "build_type": "canary",
         "child_configs": [],
         "chrome_binhost_only": false,
-        "chrome_rev": "tot",
+        "chrome_rev": null,
         "chrome_sdk": false,
         "chrome_sdk_build_chrome": true,
         "chrome_sdk_goma": false,
-        "chromeos_official": false,
+        "chromeos_official": true,
         "chroot_replace": true,
         "compilecheck": false,
         "cpe_export": true,
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Informational Chromium Uprev & Build (public)",
+        "description": "Firmware Canary",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
         "do_not_apply_cq_patches": false,
         "factory_install_netboot": true,
-        "factory_toolkit": true,
+        "factory_toolkit": false,
         "gcc_githash": null,
         "git_sync": false,
         "grouped": false,
@@ -83634,21 +86306,21 @@
         "health_alert_recipients": [],
         "health_threshold": 0,
         "hw_tests": [],
-        "hwqual": false,
+        "hwqual": true,
         "image_test": false,
-        "images": [
-            "test"
-        ],
+        "images": [],
         "important": false,
-        "internal": false,
+        "internal": true,
         "latest_toolchain": false,
         "manifest": "default.xml",
-        "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
-        "manifest_version": false,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
         "master": false,
-        "name": "squawks-tot-chromium-pfq-informational",
-        "overlays": "public",
-        "packages": [],
+        "name": "storm-firmware",
+        "overlays": "both",
+        "packages": [
+            "virtual/chromeos-firmware"
+        ],
         "paladin_builder_name": null,
         "paygen": false,
         "paygen_skip_delta_payloads": false,
@@ -83658,32 +86330,34 @@
         "pre_cq": false,
         "prebuilts": false,
         "profile": null,
-        "push_image": false,
+        "push_image": true,
         "push_overlays": null,
         "quick_unit": false,
         "rootfs_verification": true,
         "sanity_check_slaves": null,
         "shared_user_password": null,
         "signer_tests": false,
-        "sync_chrome": null,
-        "tests_supported": true,
+        "sync_chrome": false,
+        "tests_supported": false,
         "trybot_list": false,
         "unittest_blacklist": [],
-        "unittests": true,
-        "upload_hw_test_artifacts": true,
+        "unittests": false,
+        "upload_hw_test_artifacts": false,
         "upload_standalone_images": true,
         "upload_symbols": false,
-        "uprev": false,
+        "uprev": true,
         "use_chrome_lkgm": false,
-        "use_lkgm": true,
+        "use_lkgm": false,
         "use_sdk": true,
-        "useflags": [],
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
         "usepkg_build_packages": true,
         "usepkg_toolchain": true,
         "vm_test_runs": 1,
-        "vm_tests": [
-            "smoke_suite"
-        ]
+        "vm_tests": []
     },
     "storm-paladin": {
         "afdo_generate": false,
@@ -90677,6 +93351,209 @@
             "smoke_suite"
         ]
     },
+    "urara-paladin": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": false,
+        "binhost_base_url": null,
+        "binhost_bucket": null,
+        "binhost_key": null,
+        "board_replace": false,
+        "boards": [
+            "urara"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": false,
+        "build_type": "paladin",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": false,
+        "chrome_sdk_goma": false,
+        "chromeos_official": false,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Commit Queue (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": false,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": false,
+        "image_test": true,
+        "images": [
+            "base",
+            "dev"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "urara-paladin",
+        "overlays": "both",
+        "packages": [
+            "virtual/target-os",
+            "virtual/target-os-dev",
+            "chromeos-base/chromeos-initramfs"
+        ],
+        "paladin_builder_name": "urara paladin",
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": true,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": "private",
+        "profile": null,
+        "push_image": false,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": false,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": false,
+        "upload_symbols": false,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal"
+        ],
+        "usepkg_build_packages": true,
+        "usepkg_toolchain": true,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
+    "urara-release": {
+        "afdo_generate": false,
+        "afdo_generate_min": false,
+        "afdo_update_ebuild": false,
+        "afdo_use": false,
+        "archive": true,
+        "archive_build_debug": true,
+        "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+        "binhost_bucket": "gs://chromeos-dev-installer",
+        "binhost_key": "RELEASE_BINHOST",
+        "board_replace": false,
+        "boards": [
+            "urara"
+        ],
+        "branch": false,
+        "build_before_patching": false,
+        "build_packages_in_background": false,
+        "build_tests": true,
+        "build_type": "canary",
+        "child_configs": [],
+        "chrome_binhost_only": false,
+        "chrome_rev": null,
+        "chrome_sdk": false,
+        "chrome_sdk_build_chrome": true,
+        "chrome_sdk_goma": false,
+        "chromeos_official": true,
+        "chroot_replace": true,
+        "compilecheck": false,
+        "cpe_export": true,
+        "create_delta_sysroot": false,
+        "critical_for_chrome": false,
+        "debug_symbols": true,
+        "description": "Release Builds (canary) (internal)",
+        "dev_installer_prebuilts": false,
+        "dev_manifest": "default.xml",
+        "disk_layout": null,
+        "do_not_apply_cq_patches": false,
+        "factory_install_netboot": true,
+        "factory_toolkit": true,
+        "gcc_githash": null,
+        "git_sync": false,
+        "grouped": false,
+        "gs_path": "default",
+        "health_alert_recipients": [],
+        "health_threshold": 0,
+        "hw_tests": [],
+        "hwqual": true,
+        "image_test": true,
+        "images": [
+            "base",
+            "test",
+            "factory_install"
+        ],
+        "important": false,
+        "internal": true,
+        "latest_toolchain": false,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "manifest_version": true,
+        "master": false,
+        "name": "urara-release",
+        "overlays": "both",
+        "packages": [],
+        "paladin_builder_name": null,
+        "paygen": false,
+        "paygen_skip_delta_payloads": false,
+        "paygen_skip_testing": false,
+        "postsync_patch": true,
+        "postsync_reexec": true,
+        "pre_cq": false,
+        "prebuilts": false,
+        "profile": null,
+        "push_image": true,
+        "push_overlays": null,
+        "quick_unit": false,
+        "rootfs_verification": true,
+        "sanity_check_slaves": null,
+        "shared_user_password": null,
+        "signer_tests": false,
+        "sync_chrome": false,
+        "tests_supported": false,
+        "trybot_list": true,
+        "unittest_blacklist": [],
+        "unittests": false,
+        "upload_hw_test_artifacts": true,
+        "upload_standalone_images": true,
+        "upload_symbols": true,
+        "uprev": true,
+        "use_chrome_lkgm": false,
+        "use_lkgm": false,
+        "use_sdk": true,
+        "useflags": [
+            "chrome_internal",
+            "-cros-debug",
+            "-highdpi"
+        ],
+        "usepkg_build_packages": false,
+        "usepkg_toolchain": false,
+        "vm_test_runs": 1,
+        "vm_tests": []
+    },
     "veyron_pinky-chrome-pfq": {
         "afdo_generate": false,
         "afdo_generate_min": false,
Domain: Web Framework / Uncategorized;