diff --git a/cbuildbot/chromeos_config.py b/cbuildbot/chromeos_config.py
index 7002658..f296ae1 100644
--- a/cbuildbot/chromeos_config.py
+++ b/cbuildbot/chromeos_config.py
@@ -69,10 +69,8 @@
 
     # In trybots, we want to always run VM tests and all unit tests, so that
     # developers will get better testing for their changes.
-    if (my_config['build_type'] == constants.PALADIN_TYPE and
-        all(x not in _arm_boards for x in my_config['boards']) and
-        all(x not in _brillo_boards for x in my_config['boards'])):
-      my_config['vm_tests'] = my_config['vm_tests_supported']
+    if my_config['vm_tests_override'] is not None:
+      my_config['vm_tests'] = my_config['vm_tests_override']
 
   return copy_config
 
@@ -584,7 +582,7 @@
 
 # TODO(akeshet): Temporary workaround to vmtest failing on strage-pre-cq, to
 # allow already-screened changes to work through the pipeline.
-_no_vmtest_boards = _arm_boards | _mips_boards | frozenset((
+_no_vmtest_boards = _arm_boards | _mips_boards | _brillo_boards | frozenset((
     'strago',
 ))
 
@@ -682,7 +680,7 @@
 
   no_vmtest_builder = config_lib.BuildConfig(
       vm_tests=[],
-      vm_tests_supported=[],
+      vm_tests_override=None,
   )
 
   # Builder-specific mixins
@@ -727,6 +725,9 @@
       trybot_list=True,
       doc='http://www.chromium.org/chromium-os/build/builder-overview#'
           'TOC-Chrome-PFQ',
+      vm_tests=[constants.SMOKE_SUITE_TEST_TYPE,
+                constants.SIMPLE_AU_TEST_TYPE],
+      vm_tests_override=TRADITIONAL_VM_TESTS_SUPPORTED,
   )
 
   paladin = site_config.AddTemplate(
@@ -747,7 +748,7 @@
       doc='http://www.chromium.org/chromium-os/build/builder-overview#TOC-CQ',
 
       vm_tests=[constants.SMOKE_SUITE_TEST_TYPE],
-      vm_tests_supported=TRADITIONAL_VM_TESTS_SUPPORTED,
+      vm_tests_override=TRADITIONAL_VM_TESTS_SUPPORTED,
   )
 
   # Incremental builders are intended to test the developer workflow.
@@ -854,7 +855,7 @@
       # memory limits. Remove the following lines once crbug.com/329248 is
       # fixed.
       vm_tests=[constants.SMOKE_SUITE_TEST_TYPE],
-      vm_tests_supported=[constants.SMOKE_SUITE_TEST_TYPE],
+      vm_tests_override=None,
       doc='http://www.chromium.org/chromium-os/build/builder-overview#'
           'TOC-ASAN',
   )
@@ -871,7 +872,6 @@
       uprev=False,
       overlays=constants.PUBLIC_OVERLAYS,
       vm_tests=[constants.TELEMETRY_SUITE_TEST_TYPE],
-      vm_tests_supported=[constants.TELEMETRY_SUITE_TEST_TYPE],
       description='Telemetry Builds',
   )
 
@@ -885,6 +885,9 @@
       chrome_rev=constants.CHROME_REV_LATEST,
       chrome_sdk=True,
       description='Preflight Chromium Uprev & Build (public)',
+      vm_tests=[constants.SMOKE_SUITE_TEST_TYPE,
+                constants.SIMPLE_AU_TEST_TYPE],
+      vm_tests_override=None,
   )
 
   # TODO(davidjames): Convert this to an external config once the unified master
@@ -931,8 +934,6 @@
       'chromium-pfq-informational',
       chromium_pfq,
       chrome_try,
-      vm_tests=[constants.SMOKE_SUITE_TEST_TYPE],
-      vm_tests_supported=TRADITIONAL_VM_TESTS_SUPPORTED,
       chrome_sdk=False,
       description='Informational Chromium Uprev & Build (public)',
   )
@@ -1376,7 +1377,7 @@
       prebuilts=False,
       cpe_export=False,
       vm_tests=[constants.SMOKE_SUITE_TEST_TYPE],
-      vm_tests_supported=TRADITIONAL_VM_TESTS_SUPPORTED,
+      vm_tests_override=None,
       description='Verifies compilation, building an image, and vm/unit tests '
                   'if supported.',
       doc='http://www.chromium.org/chromium-os/build/builder-overview#'
@@ -1387,20 +1388,18 @@
 
   # Pre-CQ targets that only check compilation and unit tests.
   unittest_only_pre_cq = pre_cq.derive(
+      no_vmtest_builder,
       description='Verifies compilation and unit tests only',
       compilecheck=True,
-      vm_tests=[],
-      vm_tests_supported=[],
   )
 
   # Pre-CQ targets that don't run VMTests.
   no_vmtest_pre_cq = site_config.AddTemplate(
       'no-vmtest-pre-cq',
       pre_cq,
+      no_vmtest_builder,
       description='Verifies compilation, building an image, and unit tests '
                   'if supported.',
-      vm_tests=[],
-      vm_tests_supported=[],
   )
 
   # Pre-CQ targets that only check compilation.
@@ -1639,15 +1638,14 @@
           vm_tests.append(constants.SMOKE_SUITE_TEST_TYPE)
         customizations.update(vm_tests=vm_tests)
 
-      # Supported VM Tests is the paladin list + any new tests.
-      # If the board doesn't support them, base_config will disable.
-      if 'vm_tests' in customizations:
-        supported = paladin.vm_tests_supported[:]
-        for test in customizations.vm_tests:
-          if test not in supported:
-            supported.append(test)
+        if paladin.vm_tests_override is not None:
+          # Make sure any new tests are also in override.
+          override = paladin.vm_tests_override[:]
+          for test in vm_tests:
+            if test not in override:
+              override.append(test)
 
-        customizations.update(vm_tests_supported=supported)
+          customizations.update(vm_tests_override=override)
 
       if base_config.get('internal'):
         customizations.update(
@@ -1820,7 +1818,6 @@
       internal_incremental, 'lakitu-incremental',
       _base_configs['lakitu'],
       vm_tests=[constants.SMOKE_SUITE_TEST_TYPE],
-      vm_tests_supported=TRADITIONAL_VM_TESTS_SUPPORTED,
   )
 
   site_config.AddConfigWithoutTemplate(
@@ -1862,9 +1859,6 @@
       vm_tests=[constants.SMOKE_SUITE_TEST_TYPE,
                 constants.DEV_MODE_TEST_TYPE,
                 constants.CROS_VM_TEST_TYPE],
-      vm_tests_supported=[constants.SMOKE_SUITE_TEST_TYPE,
-                          constants.DEV_MODE_TEST_TYPE,
-                          constants.CROS_VM_TEST_TYPE],
       hw_tests=HWTestList.SharedPoolCanary(),
       paygen=True,
       signer_tests=True,
diff --git a/cbuildbot/chromeos_config_unittest.py b/cbuildbot/chromeos_config_unittest.py
index f5b1766..81c43ea 100644
--- a/cbuildbot/chromeos_config_unittest.py
+++ b/cbuildbot/chromeos_config_unittest.py
@@ -236,14 +236,15 @@
             config['chrome_sdk'],
             'Config %s: has chrome_sdk but not sync_chrome.' % build_name)
 
-  def testSupportedVmTestsOnly(self):
+  def testOverrideVmTestsOnly(self):
     """VM/unit tests listed should also be supported."""
     for build_name, config in self.all_configs.iteritems():
-      for test in config.vm_tests:
-        self.assertIn(
-            test, config.vm_tests_supported,
-            'Config %s: has %s VM test, without support (%s, %s).' % \
-            (build_name, test, config.vm_tests, config.vm_tests_supported))
+      if config.vm_tests_override is not None:
+        for test in config.vm_tests:
+          self.assertIn(
+              test, config.vm_tests_override,
+              'Config %s: has %s VM test, not in override (%s, %s).' % \
+              (build_name, test, config.vm_tests, config.vm_tests_override))
 
   def testHWTestsIFFArchivingHWTestArtifacts(self):
     """Make sure all configs upload artifacts that need them for hw testing."""
diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index c28dada..fc9f3c6 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -102,10 +102,7 @@
             "smoke_suite",
             "pfq_suite"
         ],
-        "vm_tests_supported": [
-            "smoke_suite",
-            "pfq_suite"
-        ]
+        "vm_tests_override": null
     },
     "_templates": {
         "asan": {
@@ -116,9 +113,7 @@
             "vm_tests": [
                 "smoke_suite"
             ],
-            "vm_tests_supported": [
-                "smoke_suite"
-            ]
+            "vm_tests_override": null
         },
         "chrome-perf": {
             "_template": "chrome-perf",
@@ -144,7 +139,7 @@
                 "chrome_internal"
             ],
             "vm_tests": [],
-            "vm_tests_supported": []
+            "vm_tests_override": null
         },
         "chrome-pfq": {
             "_template": "chrome-pfq",
@@ -162,7 +157,12 @@
             "uprev": false,
             "useflags": [
                 "chrome_internal"
-            ]
+            ],
+            "vm_tests": [
+                "smoke_suite",
+                "pfq_suite"
+            ],
+            "vm_tests_override": null
         },
         "chrome-pfq-informational": {
             "_template": "chrome-pfq-informational",
@@ -182,13 +182,10 @@
                 "chrome_internal"
             ],
             "vm_tests": [
-                "smoke_suite"
-            ],
-            "vm_tests_supported": [
                 "smoke_suite",
-                "pfq_suite",
-                "cros_vm_test"
-            ]
+                "pfq_suite"
+            ],
+            "vm_tests_override": null
         },
         "chromium-pfq": {
             "_template": "chromium-pfq",
@@ -199,7 +196,12 @@
             "important": true,
             "manifest_version": true,
             "overlays": "public",
-            "uprev": false
+            "uprev": false,
+            "vm_tests": [
+                "smoke_suite",
+                "pfq_suite"
+            ],
+            "vm_tests_override": null
         },
         "chromium-pfq-informational": {
             "_template": "chromium-pfq-informational",
@@ -213,13 +215,10 @@
             "uprev": false,
             "use_lkgm": true,
             "vm_tests": [
-                "smoke_suite"
-            ],
-            "vm_tests_supported": [
                 "smoke_suite",
-                "pfq_suite",
-                "cros_vm_test"
-            ]
+                "pfq_suite"
+            ],
+            "vm_tests_override": null
         },
         "compile-only-pre-cq": {
             "_template": "compile-only-pre-cq",
@@ -252,7 +251,7 @@
             "unittests": false,
             "upload_standalone_images": false,
             "vm_tests": [],
-            "vm_tests_supported": []
+            "vm_tests_override": null
         },
         "depthcharge-firmware": {
             "_template": "depthcharge-firmware",
@@ -297,7 +296,7 @@
             ],
             "usepkg_build_packages": true,
             "vm_tests": [],
-            "vm_tests_supported": []
+            "vm_tests_override": null
         },
         "depthcharge-full-firmware": {
             "_template": "depthcharge-full-firmware",
@@ -331,7 +330,7 @@
             ],
             "usepkg_build_packages": true,
             "vm_tests": [],
-            "vm_tests_supported": []
+            "vm_tests_override": null
         },
         "factory": {
             "_template": "factory",
@@ -377,11 +376,6 @@
                 "smoke_suite",
                 "dev_mode_test",
                 "cros_vm_test"
-            ],
-            "vm_tests_supported": [
-                "smoke_suite",
-                "dev_mode_test",
-                "cros_vm_test"
             ]
         },
         "firmware": {
@@ -426,7 +420,7 @@
             ],
             "usepkg_build_packages": true,
             "vm_tests": [],
-            "vm_tests_supported": []
+            "vm_tests_override": null
         },
         "full": {
             "_template": "full",
@@ -489,7 +483,7 @@
             "trybot_list": true,
             "upload_standalone_images": false,
             "vm_tests": [],
-            "vm_tests_supported": []
+            "vm_tests_override": null
         },
         "paladin": {
             "_template": "paladin",
@@ -513,7 +507,7 @@
             "vm_tests": [
                 "smoke_suite"
             ],
-            "vm_tests_supported": [
+            "vm_tests_override": [
                 "smoke_suite",
                 "pfq_suite",
                 "cros_vm_test"
@@ -532,7 +526,7 @@
             "unittests": false,
             "upload_hw_test_artifacts": false,
             "vm_tests": [],
-            "vm_tests_supported": []
+            "vm_tests_override": null
         },
         "pre-cq": {
             "_template": "pre-cq",
@@ -565,11 +559,7 @@
             "vm_tests": [
                 "smoke_suite"
             ],
-            "vm_tests_supported": [
-                "smoke_suite",
-                "pfq_suite",
-                "cros_vm_test"
-            ]
+            "vm_tests_override": null
         },
         "pre-flight-branch": {
             "_template": "pre-flight-branch",
@@ -588,6 +578,15 @@
             "uprev": true,
             "useflags": [
                 "chrome_internal"
+            ],
+            "vm_tests": [
+                "smoke_suite",
+                "pfq_suite"
+            ],
+            "vm_tests_override": [
+                "smoke_suite",
+                "pfq_suite",
+                "cros_vm_test"
             ]
         },
         "project-sdk": {
@@ -657,11 +656,6 @@
                 "smoke_suite",
                 "dev_mode_test",
                 "cros_vm_test"
-            ],
-            "vm_tests_supported": [
-                "smoke_suite",
-                "dev_mode_test",
-                "cros_vm_test"
             ]
         },
         "release-afdo-generate": {
@@ -715,11 +709,6 @@
                 "smoke_suite",
                 "dev_mode_test",
                 "cros_vm_test"
-            ],
-            "vm_tests_supported": [
-                "smoke_suite",
-                "dev_mode_test",
-                "cros_vm_test"
             ]
         },
         "release-afdo-use": {
@@ -771,11 +760,6 @@
                 "smoke_suite",
                 "dev_mode_test",
                 "cros_vm_test"
-            ],
-            "vm_tests_supported": [
-                "smoke_suite",
-                "dev_mode_test",
-                "cros_vm_test"
             ]
         },
         "telemetry": {
@@ -786,9 +770,6 @@
             "uprev": false,
             "vm_tests": [
                 "telemetry_suite"
-            ],
-            "vm_tests_supported": [
-                "telemetry_suite"
             ]
         },
         "test-ap": {
@@ -817,9 +798,7 @@
             "vm_tests": [
                 "smoke_suite"
             ],
-            "vm_tests_supported": [
-                "smoke_suite"
-            ]
+            "vm_tests_override": null
         }
     },
     "alex-chrome-pfq": {
@@ -856,9 +835,7 @@
         "important": false,
         "name": "amd64-generic-asan-paladin",
         "profile": "asan",
-        "vm_tests_supported": [
-            "smoke_suite"
-        ]
+        "vm_tests_override": null
     },
     "amd64-generic-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -964,9 +941,6 @@
         "name": "amd64-generic-telem-chromium-pfq-informational",
         "vm_tests": [
             "telemetry_suite"
-        ],
-        "vm_tests_supported": [
-            "telemetry_suite"
         ]
     },
     "amd64-generic-telemetry": {
@@ -1070,8 +1044,7 @@
         "manifest": "official.xml",
         "name": "arkham-chrome-pfq",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arkham-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -1090,8 +1063,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arkham-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -1120,8 +1092,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arkham-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -1157,7 +1128,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "arkham-payloads": {
         "_template": "payloads",
@@ -1180,8 +1151,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arkham-release": {
         "_template": "release",
@@ -1194,8 +1164,7 @@
         "hw_tests": [],
         "name": "arkham-release",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arkham-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -1205,8 +1174,7 @@
         "manifest": "official.xml",
         "name": "arkham-tot-chrome-pfq-informational",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arkham-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -1218,8 +1186,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arm-generic-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -1236,8 +1203,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arm-generic-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -1257,8 +1223,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arm-generic-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -1275,7 +1240,7 @@
         ],
         "name": "arm-generic-paladin",
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "arm-generic-pre-cq": {
         "_template": "pre-cq",
@@ -1283,8 +1248,7 @@
             "arm-generic"
         ],
         "name": "arm-generic-pre-cq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arm-generic-telemetry": {
         "_template": "telemetry",
@@ -1292,8 +1256,7 @@
             "arm-generic"
         ],
         "name": "arm-generic-telemetry",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arm-generic-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -1304,8 +1267,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arm-generic_freon-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -1322,8 +1284,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arm-generic_freon-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -1342,8 +1303,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arm-generic_freon-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -1360,7 +1320,7 @@
         "important": false,
         "name": "arm-generic_freon-paladin",
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "arm-generic_freon-pre-cq": {
         "_template": "pre-cq",
@@ -1368,8 +1328,7 @@
             "arm-generic_freon"
         ],
         "name": "arm-generic_freon-pre-cq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arm-generic_freon-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -1380,8 +1339,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arm64-generic-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -1398,8 +1356,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arm64-generic-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -1418,8 +1375,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arm64-generic-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -1436,7 +1392,7 @@
         "important": false,
         "name": "arm64-generic-paladin",
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "arm64-generic-pre-cq": {
         "_template": "pre-cq",
@@ -1444,8 +1400,7 @@
             "arm64-generic"
         ],
         "name": "arm64-generic-pre-cq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "arm64-generic-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -1456,8 +1411,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "auron-b-full-group": {
         "_template": "full",
@@ -2593,8 +2547,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "beaglebone-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -2611,8 +2564,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -2638,8 +2590,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone-incremental": {
         "_template": "incremental",
@@ -2702,8 +2653,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone-release": {
         "_template": "release",
@@ -2739,8 +2689,7 @@
                 ],
                 "grouped": true,
                 "name": "beaglebone-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -2749,13 +2698,11 @@
                 ],
                 "grouped": true,
                 "name": "beaglebone-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "beaglebone-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -2763,8 +2710,7 @@
             "beaglebone"
         ],
         "name": "beaglebone-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -2772,8 +2718,7 @@
             "beaglebone"
         ],
         "name": "beaglebone-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone-release-group": {
         "_template": "release",
@@ -2855,8 +2800,7 @@
         ],
         "manifest": "official.xml",
         "name": "beaglebone-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -2867,8 +2811,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone_servo-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -2878,8 +2821,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "beaglebone_servo-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone_servo-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -2896,8 +2838,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone_servo-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -2923,8 +2864,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone_servo-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -2975,8 +2915,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone_servo-release": {
         "_template": "release",
@@ -3013,8 +2952,7 @@
                 ],
                 "grouped": true,
                 "name": "beaglebone_servo-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -3023,13 +2961,11 @@
                 ],
                 "grouped": true,
                 "name": "beaglebone_servo-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "beaglebone_servo-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone_servo-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -3037,8 +2973,7 @@
             "beaglebone_servo"
         ],
         "name": "beaglebone_servo-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone_servo-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -3046,8 +2981,7 @@
             "beaglebone_servo"
         ],
         "name": "beaglebone_servo-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone_servo-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -3056,8 +2990,7 @@
         ],
         "manifest": "official.xml",
         "name": "beaglebone_servo-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beaglebone_servo-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -3068,8 +3001,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "beltino-a-full-group": {
         "_template": "full",
@@ -3433,8 +3365,7 @@
         "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
         "name": "binhost-pre-cq",
         "overlays": "both",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "bobcat-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -3645,7 +3576,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": [
+        "vm_tests_override": [
             "smoke_suite",
             "pfq_suite",
             "cros_vm_test"
@@ -4589,8 +4520,7 @@
         "manifest": "official.xml",
         "name": "cosmos-chrome-pfq",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "cosmos-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -4609,8 +4539,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "cosmos-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -4639,8 +4568,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "cosmos-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -4676,7 +4604,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "cosmos-payloads": {
         "_template": "payloads",
@@ -4699,8 +4627,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "cosmos-release": {
         "_template": "release",
@@ -4716,8 +4643,7 @@
         "paygen_skip_testing": true,
         "signer_tests": false,
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "cosmos-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -4727,8 +4653,7 @@
         "manifest": "official.xml",
         "name": "cosmos-tot-chrome-pfq-informational",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "cosmos-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -4740,8 +4665,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "cranky-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -5122,8 +5046,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "daisy-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -5140,8 +5063,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -5182,8 +5104,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -5199,8 +5120,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -5216,8 +5136,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Full Builds; Group config (boards: daisy_freon, daisy_spring-freon, daisy_skate-freon)",
@@ -5226,8 +5145,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy-freon-release-group": {
         "_template": "release",
@@ -5243,8 +5161,7 @@
                 ],
                 "grouped": true,
                 "name": "daisy_freon-release",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -5256,8 +5173,7 @@
                 "grouped": true,
                 "name": "daisy_spring-freon-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -5269,14 +5185,12 @@
                 "grouped": true,
                 "name": "daisy_skate-freon-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Release Builds (canary) (internal); Group config (boards: daisy_freon, daisy_spring-freon, daisy_skate-freon)",
         "name": "daisy-freon-release-group",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy-full": {
         "_template": "full",
@@ -5289,8 +5203,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy-full-group": {
         "_template": "full",
@@ -5309,8 +5222,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -5326,8 +5238,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -5343,8 +5254,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Full Builds; Group config (boards: daisy, daisy_spring, daisy_skate)",
@@ -5353,8 +5263,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy-incremental": {
         "_template": "incremental",
@@ -5366,8 +5275,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -5400,7 +5308,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "daisy-payloads": {
         "_template": "payloads",
@@ -5422,8 +5330,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy-release": {
         "_template": "release",
@@ -5432,8 +5339,7 @@
         ],
         "critical_for_chrome": true,
         "name": "daisy-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy-release-afdo": {
         "_template": "release-afdo-generate",
@@ -5448,8 +5354,7 @@
                 ],
                 "grouped": true,
                 "name": "daisy-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -5458,13 +5363,11 @@
                 ],
                 "grouped": true,
                 "name": "daisy-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "daisy-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -5472,8 +5375,7 @@
             "daisy"
         ],
         "name": "daisy-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -5481,8 +5383,7 @@
             "daisy"
         ],
         "name": "daisy-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy-release-group": {
         "_template": "release",
@@ -5499,8 +5400,7 @@
                 "critical_for_chrome": true,
                 "grouped": true,
                 "name": "daisy-release",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -5512,8 +5412,7 @@
                 "grouped": true,
                 "name": "daisy_spring-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -5525,16 +5424,14 @@
                 "grouped": true,
                 "name": "daisy_skate-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "critical_for_chrome": true,
         "description": "Release Builds (canary) (internal); Group config (boards: daisy, daisy_spring, daisy_skate)",
         "important": true,
         "name": "daisy-release-group",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -5543,8 +5440,7 @@
         ],
         "manifest": "official.xml",
         "name": "daisy-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -5555,8 +5451,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_freon-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -5566,8 +5461,7 @@
         ],
         "manifest": "official.xml",
         "name": "daisy_freon-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_freon-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -5584,8 +5478,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_freon-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -5611,8 +5504,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_freon-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -5645,7 +5537,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "daisy_freon-payloads": {
         "_template": "payloads",
@@ -5667,8 +5559,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_freon-release": {
         "_template": "release",
@@ -5676,8 +5567,7 @@
             "daisy_freon"
         ],
         "name": "daisy_freon-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_freon-release-afdo": {
         "_template": "release-afdo-generate",
@@ -5692,8 +5582,7 @@
                 ],
                 "grouped": true,
                 "name": "daisy_freon-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -5702,13 +5591,11 @@
                 ],
                 "grouped": true,
                 "name": "daisy_freon-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "daisy_freon-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_freon-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -5716,8 +5603,7 @@
             "daisy_freon"
         ],
         "name": "daisy_freon-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_freon-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -5725,8 +5611,7 @@
             "daisy_freon"
         ],
         "name": "daisy_freon-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_freon-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -5735,8 +5620,7 @@
         ],
         "manifest": "official.xml",
         "name": "daisy_freon-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_freon-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -5747,8 +5631,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -5763,8 +5646,7 @@
         ],
         "manifest": "official.xml",
         "name": "daisy_skate-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -5781,8 +5663,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -5814,8 +5695,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "daisy_skate-freon-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-freon-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -5832,8 +5712,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-freon-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -5859,8 +5738,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-freon-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -5893,7 +5771,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "daisy_skate-freon-payloads": {
         "_template": "payloads",
@@ -5915,8 +5793,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-freon-release": {
         "_template": "release",
@@ -5924,8 +5801,7 @@
             "daisy_skate-freon"
         ],
         "name": "daisy_skate-freon-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-freon-release-afdo": {
         "_template": "release-afdo-generate",
@@ -5940,8 +5816,7 @@
                 ],
                 "grouped": true,
                 "name": "daisy_skate-freon-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -5950,13 +5825,11 @@
                 ],
                 "grouped": true,
                 "name": "daisy_skate-freon-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "daisy_skate-freon-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-freon-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -5964,8 +5837,7 @@
             "daisy_skate-freon"
         ],
         "name": "daisy_skate-freon-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-freon-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -5973,8 +5845,7 @@
             "daisy_skate-freon"
         ],
         "name": "daisy_skate-freon-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-freon-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -5983,8 +5854,7 @@
         ],
         "manifest": "official.xml",
         "name": "daisy_skate-freon-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-freon-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -5995,8 +5865,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-full": {
         "_template": "full",
@@ -6008,8 +5877,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -6045,7 +5913,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "daisy_skate-payloads": {
         "_template": "payloads",
@@ -6067,8 +5935,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-release": {
         "_template": "release",
@@ -6076,8 +5943,7 @@
             "daisy_skate"
         ],
         "name": "daisy_skate-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-release-afdo": {
         "_template": "release-afdo-generate",
@@ -6092,8 +5958,7 @@
                 ],
                 "grouped": true,
                 "name": "daisy_skate-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -6102,13 +5967,11 @@
                 ],
                 "grouped": true,
                 "name": "daisy_skate-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "daisy_skate-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -6116,8 +5979,7 @@
             "daisy_skate"
         ],
         "name": "daisy_skate-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -6125,8 +5987,7 @@
             "daisy_skate"
         ],
         "name": "daisy_skate-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -6135,8 +5996,7 @@
         ],
         "manifest": "official.xml",
         "name": "daisy_skate-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_skate-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -6147,8 +6007,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -6158,8 +6017,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "daisy_spring-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -6176,8 +6034,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -6209,8 +6066,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "daisy_spring-freon-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-freon-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -6227,8 +6083,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-freon-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -6254,8 +6109,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-freon-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -6288,7 +6142,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "daisy_spring-freon-payloads": {
         "_template": "payloads",
@@ -6310,8 +6164,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-freon-release": {
         "_template": "release",
@@ -6319,8 +6172,7 @@
             "daisy_spring-freon"
         ],
         "name": "daisy_spring-freon-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-freon-release-afdo": {
         "_template": "release-afdo-generate",
@@ -6335,8 +6187,7 @@
                 ],
                 "grouped": true,
                 "name": "daisy_spring-freon-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -6345,13 +6196,11 @@
                 ],
                 "grouped": true,
                 "name": "daisy_spring-freon-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "daisy_spring-freon-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-freon-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -6359,8 +6208,7 @@
             "daisy_spring-freon"
         ],
         "name": "daisy_spring-freon-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-freon-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -6368,8 +6216,7 @@
             "daisy_spring-freon"
         ],
         "name": "daisy_spring-freon-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-freon-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -6378,8 +6225,7 @@
         ],
         "manifest": "official.xml",
         "name": "daisy_spring-freon-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-freon-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -6390,8 +6236,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-full": {
         "_template": "full",
@@ -6403,8 +6248,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -6438,7 +6282,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "daisy_spring-payloads": {
         "_template": "payloads",
@@ -6460,8 +6304,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-release": {
         "_template": "release",
@@ -6469,8 +6312,7 @@
             "daisy_spring"
         ],
         "name": "daisy_spring-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-release-afdo": {
         "_template": "release-afdo-generate",
@@ -6485,8 +6327,7 @@
                 ],
                 "grouped": true,
                 "name": "daisy_spring-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -6495,13 +6336,11 @@
                 ],
                 "grouped": true,
                 "name": "daisy_spring-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "daisy_spring-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -6509,8 +6348,7 @@
             "daisy_spring"
         ],
         "name": "daisy_spring-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -6518,8 +6356,7 @@
             "daisy_spring"
         ],
         "name": "daisy_spring-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -6528,8 +6365,7 @@
         ],
         "manifest": "official.xml",
         "name": "daisy_spring-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_spring-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -6540,8 +6376,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_winter-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -6554,8 +6389,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "daisy_winter-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_winter-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -6575,8 +6409,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_winter-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -6613,8 +6446,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_winter-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -6653,7 +6485,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "daisy_winter-payloads": {
         "_template": "payloads",
@@ -6678,8 +6510,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_winter-release": {
         "_template": "release",
@@ -6696,8 +6527,7 @@
             "test"
         ],
         "name": "daisy_winter-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_winter-release-afdo": {
         "_template": "release-afdo-generate",
@@ -6715,8 +6545,7 @@
                 "factory_toolkit": false,
                 "grouped": true,
                 "name": "daisy_winter-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -6728,16 +6557,14 @@
                 "factory_toolkit": false,
                 "grouped": true,
                 "name": "daisy_winter-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "factory": false,
         "factory_install_netboot": false,
         "factory_toolkit": false,
         "name": "daisy_winter-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_winter-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -6748,8 +6575,7 @@
         "factory_install_netboot": false,
         "factory_toolkit": false,
         "name": "daisy_winter-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_winter-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -6760,8 +6586,7 @@
         "factory_install_netboot": false,
         "factory_toolkit": false,
         "name": "daisy_winter-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_winter-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -6773,8 +6598,7 @@
         "factory_toolkit": false,
         "manifest": "official.xml",
         "name": "daisy_winter-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "daisy_winter-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -6788,8 +6612,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "enguarde-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -7802,7 +7625,8 @@
         "chrome_sdk": false,
         "name": "gizmo-paladin",
         "sync_chrome": false,
-        "vm_tests": []
+        "vm_tests": [],
+        "vm_tests_override": null
     },
     "gizmo-pre-cq": {
         "_template": "pre-cq",
@@ -9341,8 +9165,7 @@
         "manifest": "kayle.xml",
         "name": "kayle-chrome-pfq",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "kayle-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -9367,8 +9190,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "kayle-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -9409,8 +9231,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "kayle-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -9458,7 +9279,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "kayle-pre-cq": {
         "_template": "pre-cq",
@@ -9480,8 +9301,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "kayle-release": {
         "_template": "release",
@@ -9505,8 +9325,7 @@
         "paygen": false,
         "signer_tests": false,
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "kayle-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -9522,8 +9341,7 @@
         "manifest": "kayle.xml",
         "name": "kayle-tot-chrome-pfq-informational",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "kayle-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -9541,8 +9359,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "kernel-3_14-a-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -9933,11 +9750,6 @@
         ],
         "vm_tests": [
             "smoke_suite"
-        ],
-        "vm_tests_supported": [
-            "smoke_suite",
-            "pfq_suite",
-            "cros_vm_test"
         ]
     },
     "lakitu-no-vmtest-pre-cq": {
@@ -9979,7 +9791,8 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": []
+        "vm_tests": [],
+        "vm_tests_override": null
     },
     "lakitu-payloads": {
         "_template": "payloads",
@@ -11270,8 +11083,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipseb-n32-generic-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -11292,8 +11104,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipseb-n32-generic-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -11312,7 +11123,7 @@
         "name": "mipseb-n32-generic-paladin",
         "usepkg_toolchain": false,
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "mipseb-n32-generic-pre-cq": {
         "_template": "pre-cq",
@@ -11321,8 +11132,7 @@
         ],
         "name": "mipseb-n32-generic-pre-cq",
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipseb-n32-generic-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -11334,8 +11144,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipseb-n64-generic-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -11353,8 +11162,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipseb-n64-generic-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -11375,8 +11183,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipseb-n64-generic-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -11395,7 +11202,7 @@
         "name": "mipseb-n64-generic-paladin",
         "usepkg_toolchain": false,
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "mipseb-n64-generic-pre-cq": {
         "_template": "pre-cq",
@@ -11404,8 +11211,7 @@
         ],
         "name": "mipseb-n64-generic-pre-cq",
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipseb-n64-generic-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -11417,8 +11223,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipseb-o32-generic-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -11436,8 +11241,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipseb-o32-generic-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -11458,8 +11262,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipseb-o32-generic-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -11478,7 +11281,7 @@
         "name": "mipseb-o32-generic-paladin",
         "usepkg_toolchain": false,
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "mipseb-o32-generic-pre-cq": {
         "_template": "pre-cq",
@@ -11487,8 +11290,7 @@
         ],
         "name": "mipseb-o32-generic-pre-cq",
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipseb-o32-generic-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -11500,8 +11302,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipsel-n32-generic-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -11519,8 +11320,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipsel-n32-generic-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -11541,8 +11341,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipsel-n32-generic-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -11561,7 +11360,7 @@
         "name": "mipsel-n32-generic-paladin",
         "usepkg_toolchain": false,
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "mipsel-n32-generic-pre-cq": {
         "_template": "pre-cq",
@@ -11570,8 +11369,7 @@
         ],
         "name": "mipsel-n32-generic-pre-cq",
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipsel-n32-generic-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -11583,8 +11381,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipsel-n64-generic-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -11602,8 +11399,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipsel-n64-generic-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -11624,8 +11420,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipsel-n64-generic-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -11644,7 +11439,7 @@
         "name": "mipsel-n64-generic-paladin",
         "usepkg_toolchain": false,
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "mipsel-n64-generic-pre-cq": {
         "_template": "pre-cq",
@@ -11653,8 +11448,7 @@
         ],
         "name": "mipsel-n64-generic-pre-cq",
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipsel-n64-generic-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -11666,8 +11460,7 @@
             "-chrome_internal"
         ],
         "usepkg_toolchain": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipsel-o32-generic-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -11684,8 +11477,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipsel-o32-generic-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -11705,8 +11497,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipsel-o32-generic-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -11723,7 +11514,7 @@
         ],
         "name": "mipsel-o32-generic-paladin",
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "mipsel-o32-generic-payloads": {
         "_template": "payloads",
@@ -11738,8 +11529,7 @@
             "mipsel-o32-generic"
         ],
         "name": "mipsel-o32-generic-pre-cq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipsel-o32-generic-release": {
         "_template": "release",
@@ -11750,8 +11540,7 @@
         "hw_tests": [],
         "name": "mipsel-o32-generic-release",
         "paygen_skip_delta_payloads": true,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mipsel-o32-generic-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -11762,8 +11551,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "mixed-a-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -12268,8 +12056,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "nyan-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -12286,8 +12073,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -12313,8 +12099,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan-full-compile-paladin": {
         "_template": "paladin",
@@ -12339,7 +12124,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "nyan-full-group": {
         "_template": "full",
@@ -12358,8 +12143,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -12375,8 +12159,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -12392,8 +12175,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -12409,8 +12191,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Full Builds; Group config (boards: nyan, nyan_big, nyan_blaze, nyan_kitty)",
@@ -12419,8 +12200,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -12453,7 +12233,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "nyan-payloads": {
         "_template": "payloads",
@@ -12475,8 +12255,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan-release": {
         "_template": "release",
@@ -12484,8 +12263,7 @@
             "nyan"
         ],
         "name": "nyan-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan-release-afdo": {
         "_template": "release-afdo-generate",
@@ -12500,8 +12278,7 @@
                 ],
                 "grouped": true,
                 "name": "nyan-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -12510,13 +12287,11 @@
                 ],
                 "grouped": true,
                 "name": "nyan-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "nyan-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -12524,8 +12299,7 @@
             "nyan"
         ],
         "name": "nyan-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -12533,8 +12307,7 @@
             "nyan"
         ],
         "name": "nyan-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan-release-group": {
         "_template": "release",
@@ -12550,8 +12323,7 @@
                 ],
                 "grouped": true,
                 "name": "nyan-release",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -12563,8 +12335,7 @@
                 "grouped": true,
                 "name": "nyan_big-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -12576,8 +12347,7 @@
                 "grouped": true,
                 "name": "nyan_blaze-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -12589,15 +12359,13 @@
                 "grouped": true,
                 "name": "nyan_kitty-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Release Builds (canary) (internal); Group config (boards: nyan, nyan_big, nyan_blaze, nyan_kitty)",
         "important": true,
         "name": "nyan-release-group",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -12606,8 +12374,7 @@
         ],
         "manifest": "official.xml",
         "name": "nyan-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -12618,8 +12385,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_big-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -12629,8 +12395,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "nyan_big-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_big-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -12647,8 +12412,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_big-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -12674,8 +12438,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_big-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -12708,7 +12471,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "nyan_big-payloads": {
         "_template": "payloads",
@@ -12730,8 +12493,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_big-release": {
         "_template": "release",
@@ -12739,8 +12501,7 @@
             "nyan_big"
         ],
         "name": "nyan_big-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_big-release-afdo": {
         "_template": "release-afdo-generate",
@@ -12755,8 +12516,7 @@
                 ],
                 "grouped": true,
                 "name": "nyan_big-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -12765,13 +12525,11 @@
                 ],
                 "grouped": true,
                 "name": "nyan_big-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "nyan_big-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_big-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -12779,8 +12537,7 @@
             "nyan_big"
         ],
         "name": "nyan_big-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_big-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -12788,8 +12545,7 @@
             "nyan_big"
         ],
         "name": "nyan_big-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_big-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -12798,8 +12554,7 @@
         ],
         "manifest": "official.xml",
         "name": "nyan_big-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_big-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -12810,8 +12565,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_blaze-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -12821,8 +12575,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "nyan_blaze-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_blaze-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -12839,8 +12592,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_blaze-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -12866,8 +12618,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_blaze-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -12900,7 +12651,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "nyan_blaze-payloads": {
         "_template": "payloads",
@@ -12922,8 +12673,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_blaze-release": {
         "_template": "release",
@@ -12931,8 +12681,7 @@
             "nyan_blaze"
         ],
         "name": "nyan_blaze-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_blaze-release-afdo": {
         "_template": "release-afdo-generate",
@@ -12947,8 +12696,7 @@
                 ],
                 "grouped": true,
                 "name": "nyan_blaze-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -12957,13 +12705,11 @@
                 ],
                 "grouped": true,
                 "name": "nyan_blaze-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "nyan_blaze-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_blaze-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -12971,8 +12717,7 @@
             "nyan_blaze"
         ],
         "name": "nyan_blaze-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_blaze-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -12980,8 +12725,7 @@
             "nyan_blaze"
         ],
         "name": "nyan_blaze-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_blaze-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -12990,8 +12734,7 @@
         ],
         "manifest": "official.xml",
         "name": "nyan_blaze-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_blaze-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -13002,8 +12745,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_freon-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -13013,8 +12755,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "nyan_freon-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_freon-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -13031,8 +12772,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_freon-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -13058,8 +12798,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_freon-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -13092,7 +12831,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "nyan_freon-payloads": {
         "_template": "payloads",
@@ -13114,8 +12853,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_freon-release": {
         "_template": "release",
@@ -13124,8 +12862,7 @@
             "nyan_freon"
         ],
         "name": "nyan_freon-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_freon-release-afdo": {
         "_template": "release-afdo-generate",
@@ -13140,8 +12877,7 @@
                 ],
                 "grouped": true,
                 "name": "nyan_freon-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -13150,13 +12886,11 @@
                 ],
                 "grouped": true,
                 "name": "nyan_freon-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "nyan_freon-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_freon-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -13164,8 +12898,7 @@
             "nyan_freon"
         ],
         "name": "nyan_freon-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_freon-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -13173,8 +12906,7 @@
             "nyan_freon"
         ],
         "name": "nyan_freon-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_freon-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -13183,8 +12915,7 @@
         ],
         "manifest": "official.xml",
         "name": "nyan_freon-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_freon-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -13195,8 +12926,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_kitty-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -13206,8 +12936,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "nyan_kitty-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_kitty-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -13224,8 +12953,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_kitty-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -13251,8 +12979,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_kitty-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -13285,7 +13012,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "nyan_kitty-payloads": {
         "_template": "payloads",
@@ -13307,8 +13034,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_kitty-release": {
         "_template": "release",
@@ -13316,8 +13042,7 @@
             "nyan_kitty"
         ],
         "name": "nyan_kitty-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_kitty-release-afdo": {
         "_template": "release-afdo-generate",
@@ -13332,8 +13057,7 @@
                 ],
                 "grouped": true,
                 "name": "nyan_kitty-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -13342,13 +13066,11 @@
                 ],
                 "grouped": true,
                 "name": "nyan_kitty-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "nyan_kitty-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_kitty-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -13356,8 +13078,7 @@
             "nyan_kitty"
         ],
         "name": "nyan_kitty-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_kitty-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -13365,8 +13086,7 @@
             "nyan_kitty"
         ],
         "name": "nyan_kitty-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_kitty-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -13375,8 +13095,7 @@
         ],
         "manifest": "official.xml",
         "name": "nyan_kitty-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "nyan_kitty-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -13387,8 +13106,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "oak-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -13398,8 +13116,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "oak-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "oak-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -13416,8 +13133,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "oak-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -13444,8 +13160,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "oak-full-group": {
         "_template": "full",
@@ -13464,8 +13179,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Full Builds; Group config (boards: oak)",
@@ -13474,8 +13188,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "oak-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -13508,7 +13221,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "oak-payloads": {
         "_template": "payloads",
@@ -13530,8 +13243,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "oak-release": {
         "_template": "release",
@@ -13539,8 +13251,7 @@
             "oak"
         ],
         "name": "oak-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "oak-release-afdo": {
         "_template": "release-afdo-generate",
@@ -13555,8 +13266,7 @@
                 ],
                 "grouped": true,
                 "name": "oak-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -13565,13 +13275,11 @@
                 ],
                 "grouped": true,
                 "name": "oak-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "oak-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "oak-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -13579,8 +13287,7 @@
             "oak"
         ],
         "name": "oak-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "oak-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -13588,8 +13295,7 @@
             "oak"
         ],
         "name": "oak-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "oak-release-group": {
         "_template": "release",
@@ -13605,15 +13311,13 @@
                 ],
                 "grouped": true,
                 "name": "oak-release",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Release Builds (canary) (internal); Group config (boards: oak)",
         "important": true,
         "name": "oak-release-group",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "oak-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -13622,8 +13326,7 @@
         ],
         "manifest": "official.xml",
         "name": "oak-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "oak-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -13634,8 +13337,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "orco-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -14137,7 +13839,8 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": []
+        "vm_tests": [],
+        "vm_tests_override": null
     },
     "panther_embedded-payloads": {
         "_template": "payloads",
@@ -14509,7 +14212,7 @@
         "vm_tests": [
             "dev_mode_test"
         ],
-        "vm_tests_supported": [
+        "vm_tests_override": [
             "smoke_suite",
             "pfq_suite",
             "cros_vm_test",
@@ -15148,8 +14851,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -15165,8 +14867,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Full Builds; Group config (boards: peach_pit-freon, peach_pi-freon)",
@@ -15175,8 +14876,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach-freon-release-group": {
         "_template": "release",
@@ -15192,8 +14892,7 @@
                 ],
                 "grouped": true,
                 "name": "peach_pit-freon-release",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -15205,14 +14904,12 @@
                 "grouped": true,
                 "name": "peach_pi-freon-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Release Builds (canary) (internal); Group config (boards: peach_pit-freon, peach_pi-freon)",
         "name": "peach-freon-release-group",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach-full-group": {
         "_template": "full",
@@ -15231,8 +14928,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -15248,8 +14944,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Full Builds; Group config (boards: peach_pit, peach_pi)",
@@ -15258,8 +14953,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach-release-group": {
         "_template": "release",
@@ -15275,8 +14969,7 @@
                 ],
                 "grouped": true,
                 "name": "peach_pit-release",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -15288,15 +14981,13 @@
                 "grouped": true,
                 "name": "peach_pi-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Release Builds (canary) (internal); Group config (boards: peach_pit, peach_pi)",
         "important": true,
         "name": "peach-release-group",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -15306,8 +14997,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "peach_pi-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -15324,8 +15014,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -15357,8 +15046,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "peach_pi-freon-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-freon-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -15375,8 +15063,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-freon-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -15402,8 +15089,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-freon-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -15436,7 +15122,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "peach_pi-freon-payloads": {
         "_template": "payloads",
@@ -15458,8 +15144,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-freon-release": {
         "_template": "release",
@@ -15467,8 +15152,7 @@
             "peach_pi-freon"
         ],
         "name": "peach_pi-freon-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-freon-release-afdo": {
         "_template": "release-afdo-generate",
@@ -15483,8 +15167,7 @@
                 ],
                 "grouped": true,
                 "name": "peach_pi-freon-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -15493,13 +15176,11 @@
                 ],
                 "grouped": true,
                 "name": "peach_pi-freon-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "peach_pi-freon-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-freon-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -15507,8 +15188,7 @@
             "peach_pi-freon"
         ],
         "name": "peach_pi-freon-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-freon-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -15516,8 +15196,7 @@
             "peach_pi-freon"
         ],
         "name": "peach_pi-freon-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-freon-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -15526,8 +15205,7 @@
         ],
         "manifest": "official.xml",
         "name": "peach_pi-freon-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-freon-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -15538,8 +15216,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-full": {
         "_template": "full",
@@ -15551,8 +15228,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -15585,7 +15261,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "peach_pi-payloads": {
         "_template": "payloads",
@@ -15607,8 +15283,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-release": {
         "_template": "release",
@@ -15616,8 +15291,7 @@
             "peach_pi"
         ],
         "name": "peach_pi-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-release-afdo": {
         "_template": "release-afdo-generate",
@@ -15632,8 +15306,7 @@
                 ],
                 "grouped": true,
                 "name": "peach_pi-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -15642,13 +15315,11 @@
                 ],
                 "grouped": true,
                 "name": "peach_pi-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "peach_pi-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -15656,8 +15327,7 @@
             "peach_pi"
         ],
         "name": "peach_pi-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -15665,8 +15335,7 @@
             "peach_pi"
         ],
         "name": "peach_pi-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -15675,8 +15344,7 @@
         ],
         "manifest": "official.xml",
         "name": "peach_pi-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pi-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -15687,8 +15355,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -15704,8 +15371,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "peach_pit-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -15722,8 +15388,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -15755,8 +15420,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "peach_pit-freon-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-freon-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -15773,8 +15437,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-freon-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -15800,8 +15463,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-freon-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -15834,7 +15496,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "peach_pit-freon-payloads": {
         "_template": "payloads",
@@ -15856,8 +15518,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-freon-release": {
         "_template": "release",
@@ -15865,8 +15526,7 @@
             "peach_pit-freon"
         ],
         "name": "peach_pit-freon-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-freon-release-afdo": {
         "_template": "release-afdo-generate",
@@ -15881,8 +15541,7 @@
                 ],
                 "grouped": true,
                 "name": "peach_pit-freon-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -15891,13 +15550,11 @@
                 ],
                 "grouped": true,
                 "name": "peach_pit-freon-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "peach_pit-freon-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-freon-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -15905,8 +15562,7 @@
             "peach_pit-freon"
         ],
         "name": "peach_pit-freon-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-freon-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -15914,8 +15570,7 @@
             "peach_pit-freon"
         ],
         "name": "peach_pit-freon-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-freon-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -15924,8 +15579,7 @@
         ],
         "manifest": "official.xml",
         "name": "peach_pit-freon-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-freon-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -15936,8 +15590,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-full": {
         "_template": "full",
@@ -15949,8 +15602,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -15986,7 +15638,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "peach_pit-payloads": {
         "_template": "payloads",
@@ -16008,8 +15660,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-release": {
         "_template": "release",
@@ -16017,8 +15668,7 @@
             "peach_pit"
         ],
         "name": "peach_pit-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-release-afdo": {
         "_template": "release-afdo-generate",
@@ -16033,8 +15683,7 @@
                 ],
                 "grouped": true,
                 "name": "peach_pit-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -16043,13 +15692,11 @@
                 ],
                 "grouped": true,
                 "name": "peach_pit-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "peach_pit-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -16057,8 +15704,7 @@
             "peach_pit"
         ],
         "name": "peach_pit-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -16066,8 +15712,7 @@
             "peach_pit"
         ],
         "name": "peach_pit-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -16076,8 +15721,7 @@
         ],
         "manifest": "official.xml",
         "name": "peach_pit-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peach_pit-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -16088,8 +15732,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "peppy-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -16629,7 +16272,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": [
+        "vm_tests_override": [
             "smoke_suite",
             "pfq_suite",
             "cros_vm_test"
@@ -16645,8 +16288,7 @@
         "manifest": "official.xml",
         "name": "purin-chrome-pfq",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "purin-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -16665,8 +16307,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "purin-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -16695,8 +16336,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "purin-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -16732,7 +16372,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "purin-payloads": {
         "_template": "payloads",
@@ -16755,8 +16395,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "purin-release": {
         "_template": "release",
@@ -16769,8 +16408,7 @@
         "hw_tests": [],
         "name": "purin-release",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "purin-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -16780,8 +16418,7 @@
         "manifest": "official.xml",
         "name": "purin-tot-chrome-pfq-informational",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "purin-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -16793,8 +16430,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "quawks-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -17993,8 +17629,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "rush-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -18011,8 +17646,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -18038,8 +17672,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -18072,7 +17705,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "rush-pre-cq": {
         "_template": "pre-cq",
@@ -18087,8 +17720,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush-release": {
         "_template": "release",
@@ -18099,8 +17731,7 @@
         "name": "rush-release",
         "paygen": false,
         "signer_tests": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush-release-afdo": {
         "_template": "release-afdo-generate",
@@ -18115,8 +17746,7 @@
                 ],
                 "grouped": true,
                 "name": "rush-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -18125,13 +17755,11 @@
                 ],
                 "grouped": true,
                 "name": "rush-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "rush-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -18139,8 +17767,7 @@
             "rush"
         ],
         "name": "rush-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -18148,8 +17775,7 @@
             "rush"
         ],
         "name": "rush-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -18158,8 +17784,7 @@
         ],
         "manifest": "official.xml",
         "name": "rush-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -18170,8 +17795,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush_ryu-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -18181,8 +17805,7 @@
         ],
         "manifest": "official.xml",
         "name": "rush_ryu-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush_ryu-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -18199,8 +17822,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush_ryu-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -18226,8 +17848,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush_ryu-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -18260,7 +17881,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "rush_ryu-pre-cq": {
         "_template": "pre-cq",
@@ -18275,8 +17896,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush_ryu-release": {
         "_template": "release",
@@ -18295,8 +17915,7 @@
         "paygen": false,
         "push_image": false,
         "signer_tests": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush_ryu-release-afdo": {
         "_template": "release-afdo-generate",
@@ -18311,8 +17930,7 @@
                 ],
                 "grouped": true,
                 "name": "rush_ryu-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -18321,13 +17939,11 @@
                 ],
                 "grouped": true,
                 "name": "rush_ryu-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "rush_ryu-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush_ryu-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -18335,8 +17951,7 @@
             "rush_ryu"
         ],
         "name": "rush_ryu-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush_ryu-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -18344,8 +17959,7 @@
             "rush_ryu"
         ],
         "name": "rush_ryu-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush_ryu-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -18354,8 +17968,7 @@
         ],
         "manifest": "official.xml",
         "name": "rush_ryu-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "rush_ryu-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -18366,8 +17979,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "samus-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -19175,8 +18787,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "smaug-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "smaug-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -19196,8 +18807,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "smaug-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -19244,8 +18854,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "smaug-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -19284,7 +18893,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "smaug-payloads": {
         "_template": "payloads",
@@ -19309,8 +18918,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "smaug-release": {
         "_template": "release",
@@ -19327,8 +18935,7 @@
             "test"
         ],
         "name": "smaug-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "smaug-release-afdo": {
         "_template": "release-afdo-generate",
@@ -19346,8 +18953,7 @@
                 "factory_toolkit": false,
                 "grouped": true,
                 "name": "smaug-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -19359,16 +18965,14 @@
                 "factory_toolkit": false,
                 "grouped": true,
                 "name": "smaug-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "factory": false,
         "factory_install_netboot": false,
         "factory_toolkit": false,
         "name": "smaug-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "smaug-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -19379,8 +18983,7 @@
         "factory_install_netboot": false,
         "factory_toolkit": false,
         "name": "smaug-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "smaug-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -19391,8 +18994,7 @@
         "factory_install_netboot": false,
         "factory_toolkit": false,
         "name": "smaug-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "smaug-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -19404,8 +19006,7 @@
         "factory_toolkit": false,
         "manifest": "official.xml",
         "name": "smaug-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "smaug-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -19419,8 +19020,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "squawks-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -19627,8 +19227,7 @@
         "manifest": "official.xml",
         "name": "storm-chrome-pfq",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "storm-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -19647,8 +19246,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "storm-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -19685,8 +19283,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "storm-full-group": {
         "_template": "full",
@@ -19707,8 +19304,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -19726,8 +19322,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -19745,8 +19340,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "chrome_sdk": false,
@@ -19757,8 +19351,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "storm-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -19794,7 +19387,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "storm-payloads": {
         "_template": "payloads",
@@ -19817,8 +19410,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "storm-release": {
         "_template": "release",
@@ -19833,8 +19425,7 @@
         "paygen_skip_testing": true,
         "signer_tests": false,
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "storm-release-group": {
         "_template": "release",
@@ -19858,8 +19449,7 @@
                 "paygen_skip_testing": true,
                 "signer_tests": false,
                 "sync_chrome": false,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -19876,8 +19466,7 @@
                 "name": "arkham-release",
                 "sync_chrome": false,
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -19893,8 +19482,7 @@
                 "name": "whirlwind-release",
                 "sync_chrome": false,
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "chrome_sdk": false,
@@ -19905,8 +19493,7 @@
         "paygen_skip_testing": true,
         "signer_tests": false,
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "storm-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -19916,8 +19503,7 @@
         "manifest": "official.xml",
         "name": "storm-tot-chrome-pfq-informational",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "storm-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -19929,8 +19515,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "stout-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -20117,8 +19702,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "strago-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "strago-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -20135,8 +19719,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "strago-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -20190,8 +19773,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "strago-full-group": {
         "_template": "full",
@@ -20210,8 +19792,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -20236,8 +19817,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "strago-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -20270,7 +19850,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "strago-payloads": {
         "_template": "payloads",
@@ -20292,8 +19872,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "strago-release": {
         "_template": "release",
@@ -20301,8 +19880,7 @@
             "strago"
         ],
         "name": "strago-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "strago-release-afdo": {
         "_template": "release-afdo-generate",
@@ -20317,8 +19895,7 @@
                 ],
                 "grouped": true,
                 "name": "strago-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -20327,13 +19904,11 @@
                 ],
                 "grouped": true,
                 "name": "strago-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "strago-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "strago-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -20341,8 +19916,7 @@
             "strago"
         ],
         "name": "strago-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "strago-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -20350,8 +19924,7 @@
             "strago"
         ],
         "name": "strago-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "strago-release-group": {
         "_template": "release",
@@ -20367,8 +19940,7 @@
                 ],
                 "grouped": true,
                 "name": "strago-release",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -20385,8 +19957,7 @@
         ],
         "description": "Release Builds (canary) (internal); Group config (boards: strago, cyan)",
         "name": "strago-release-group",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "strago-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -20395,8 +19966,7 @@
         ],
         "manifest": "official.xml",
         "name": "strago-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "strago-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -20407,8 +19977,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "stumpy-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -21805,8 +21374,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -21822,8 +21390,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -21839,8 +21406,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -21856,8 +21422,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Full Builds; Group config (boards: veyron_gus, veyron_jaq, veyron_minnie, veyron_rialto)",
@@ -21866,8 +21431,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron-b-release-group": {
         "_template": "release",
@@ -21883,8 +21447,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_gus-release",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -21896,8 +21459,7 @@
                 "grouped": true,
                 "name": "veyron_jaq-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -21909,8 +21471,7 @@
                 "grouped": true,
                 "name": "veyron_minnie-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -21924,14 +21485,12 @@
                 "name": "veyron_rialto-release",
                 "sync_chrome": false,
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Release Builds (canary) (internal); Group config (boards: veyron_gus, veyron_jaq, veyron_minnie, veyron_rialto)",
         "name": "veyron-b-release-group",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron-c-full-group": {
         "_template": "full",
@@ -21950,8 +21509,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -21967,8 +21525,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -21984,8 +21541,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -22001,8 +21557,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Full Builds; Group config (boards: veyron_brain, veyron_danger, veyron_thea, veyron_shark)",
@@ -22011,8 +21566,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron-c-release-group": {
         "_template": "release",
@@ -22028,8 +21582,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_brain-release",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -22041,8 +21594,7 @@
                 "grouped": true,
                 "name": "veyron_danger-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -22054,8 +21606,7 @@
                 "grouped": true,
                 "name": "veyron_thea-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -22067,14 +21618,12 @@
                 "grouped": true,
                 "name": "veyron_shark-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Release Builds (canary) (internal); Group config (boards: veyron_brain, veyron_danger, veyron_thea, veyron_shark)",
         "name": "veyron-c-release-group",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron-d-full-group": {
         "_template": "full",
@@ -22093,8 +21642,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -22110,8 +21658,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Full Builds; Group config (boards: veyron_mickey, veyron_romy)",
@@ -22120,8 +21667,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron-d-release-group": {
         "_template": "release",
@@ -22138,8 +21684,7 @@
                 "grouped": true,
                 "hw_tests": [],
                 "name": "veyron_mickey-release",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -22152,15 +21697,13 @@
                 "hw_tests": [],
                 "name": "veyron_romy-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Release Builds (canary) (internal); Group config (boards: veyron_mickey, veyron_romy)",
         "hw_tests": [],
         "name": "veyron-d-release-group",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron-full-group": {
         "_template": "full",
@@ -22179,8 +21722,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -22196,8 +21738,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -22213,8 +21754,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "full",
@@ -22230,8 +21770,7 @@
                 "useflags": [
                     "-chrome_internal"
                 ],
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Full Builds; Group config (boards: veyron_pinky, veyron_jerry, veyron_mighty, veyron_speedy)",
@@ -22240,8 +21779,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron-release-group": {
         "_template": "release",
@@ -22257,8 +21795,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_pinky-release",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -22270,8 +21807,7 @@
                 "grouped": true,
                 "name": "veyron_jerry-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -22283,8 +21819,7 @@
                 "grouped": true,
                 "name": "veyron_mighty-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release",
@@ -22296,15 +21831,13 @@
                 "grouped": true,
                 "name": "veyron_speedy-release",
                 "unittests": null,
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "description": "Release Builds (canary) (internal); Group config (boards: veyron_pinky, veyron_jerry, veyron_mighty, veyron_speedy)",
         "important": true,
         "name": "veyron-release-group",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_brain-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -22314,8 +21847,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "veyron_brain-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_brain-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -22332,8 +21864,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_brain-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -22359,8 +21890,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_brain-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -22393,7 +21923,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "veyron_brain-payloads": {
         "_template": "payloads",
@@ -22415,8 +21945,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_brain-release": {
         "_template": "release",
@@ -22424,8 +21953,7 @@
             "veyron_brain"
         ],
         "name": "veyron_brain-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_brain-release-afdo": {
         "_template": "release-afdo-generate",
@@ -22440,8 +21968,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_brain-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -22450,13 +21977,11 @@
                 ],
                 "grouped": true,
                 "name": "veyron_brain-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "veyron_brain-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_brain-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -22464,8 +21989,7 @@
             "veyron_brain"
         ],
         "name": "veyron_brain-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_brain-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -22473,8 +21997,7 @@
             "veyron_brain"
         ],
         "name": "veyron_brain-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_brain-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -22483,8 +22006,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_brain-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_brain-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -22495,8 +22017,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_danger-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -22506,8 +22027,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "veyron_danger-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_danger-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -22524,8 +22044,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_danger-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -22551,8 +22070,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_danger-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -22585,7 +22103,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "veyron_danger-payloads": {
         "_template": "payloads",
@@ -22607,8 +22125,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_danger-release": {
         "_template": "release",
@@ -22616,8 +22133,7 @@
             "veyron_danger"
         ],
         "name": "veyron_danger-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_danger-release-afdo": {
         "_template": "release-afdo-generate",
@@ -22632,8 +22148,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_danger-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -22642,13 +22157,11 @@
                 ],
                 "grouped": true,
                 "name": "veyron_danger-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "veyron_danger-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_danger-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -22656,8 +22169,7 @@
             "veyron_danger"
         ],
         "name": "veyron_danger-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_danger-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -22665,8 +22177,7 @@
             "veyron_danger"
         ],
         "name": "veyron_danger-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_danger-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -22675,8 +22186,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_danger-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_danger-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -22687,8 +22197,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_gus-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -22698,8 +22207,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "veyron_gus-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_gus-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -22716,8 +22224,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_gus-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -22743,8 +22250,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_gus-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -22777,7 +22283,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "veyron_gus-payloads": {
         "_template": "payloads",
@@ -22799,8 +22305,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_gus-release": {
         "_template": "release",
@@ -22808,8 +22313,7 @@
             "veyron_gus"
         ],
         "name": "veyron_gus-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_gus-release-afdo": {
         "_template": "release-afdo-generate",
@@ -22824,8 +22328,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_gus-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -22834,13 +22337,11 @@
                 ],
                 "grouped": true,
                 "name": "veyron_gus-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "veyron_gus-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_gus-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -22848,8 +22349,7 @@
             "veyron_gus"
         ],
         "name": "veyron_gus-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_gus-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -22857,8 +22357,7 @@
             "veyron_gus"
         ],
         "name": "veyron_gus-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_gus-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -22867,8 +22366,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_gus-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_gus-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -22879,8 +22377,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jaq-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -22890,8 +22387,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "veyron_jaq-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jaq-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -22908,8 +22404,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jaq-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -22935,8 +22430,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jaq-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -22969,7 +22463,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "veyron_jaq-payloads": {
         "_template": "payloads",
@@ -22991,8 +22485,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jaq-release": {
         "_template": "release",
@@ -23000,8 +22493,7 @@
             "veyron_jaq"
         ],
         "name": "veyron_jaq-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jaq-release-afdo": {
         "_template": "release-afdo-generate",
@@ -23016,8 +22508,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_jaq-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -23026,13 +22517,11 @@
                 ],
                 "grouped": true,
                 "name": "veyron_jaq-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "veyron_jaq-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jaq-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -23040,8 +22529,7 @@
             "veyron_jaq"
         ],
         "name": "veyron_jaq-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jaq-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -23049,8 +22537,7 @@
             "veyron_jaq"
         ],
         "name": "veyron_jaq-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jaq-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -23059,8 +22546,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_jaq-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jaq-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -23071,8 +22557,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jerry-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -23082,8 +22567,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "veyron_jerry-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jerry-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -23100,8 +22584,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jerry-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -23127,8 +22610,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jerry-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -23161,7 +22643,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "veyron_jerry-payloads": {
         "_template": "payloads",
@@ -23183,8 +22665,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jerry-release": {
         "_template": "release",
@@ -23192,8 +22673,7 @@
             "veyron_jerry"
         ],
         "name": "veyron_jerry-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jerry-release-afdo": {
         "_template": "release-afdo-generate",
@@ -23208,8 +22688,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_jerry-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -23218,13 +22697,11 @@
                 ],
                 "grouped": true,
                 "name": "veyron_jerry-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "veyron_jerry-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jerry-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -23232,8 +22709,7 @@
             "veyron_jerry"
         ],
         "name": "veyron_jerry-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jerry-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -23241,8 +22717,7 @@
             "veyron_jerry"
         ],
         "name": "veyron_jerry-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jerry-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -23251,8 +22726,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_jerry-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_jerry-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -23263,8 +22737,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mickey-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -23274,8 +22747,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "veyron_mickey-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mickey-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -23292,8 +22764,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mickey-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -23319,8 +22790,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mickey-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -23353,7 +22823,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "veyron_mickey-payloads": {
         "_template": "payloads",
@@ -23375,8 +22845,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mickey-release": {
         "_template": "release",
@@ -23385,8 +22854,7 @@
         ],
         "hw_tests": [],
         "name": "veyron_mickey-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mickey-release-afdo": {
         "_template": "release-afdo-generate",
@@ -23401,8 +22869,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_mickey-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -23411,13 +22878,11 @@
                 ],
                 "grouped": true,
                 "name": "veyron_mickey-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "veyron_mickey-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mickey-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -23425,8 +22890,7 @@
             "veyron_mickey"
         ],
         "name": "veyron_mickey-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mickey-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -23434,8 +22898,7 @@
             "veyron_mickey"
         ],
         "name": "veyron_mickey-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mickey-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -23444,8 +22907,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_mickey-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mickey-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -23456,8 +22918,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mighty-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -23467,8 +22928,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "veyron_mighty-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mighty-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -23485,8 +22945,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mighty-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -23512,8 +22971,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mighty-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -23546,7 +23004,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "veyron_mighty-payloads": {
         "_template": "payloads",
@@ -23568,8 +23026,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mighty-release": {
         "_template": "release",
@@ -23577,8 +23034,7 @@
             "veyron_mighty"
         ],
         "name": "veyron_mighty-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mighty-release-afdo": {
         "_template": "release-afdo-generate",
@@ -23593,8 +23049,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_mighty-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -23603,13 +23058,11 @@
                 ],
                 "grouped": true,
                 "name": "veyron_mighty-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "veyron_mighty-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mighty-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -23617,8 +23070,7 @@
             "veyron_mighty"
         ],
         "name": "veyron_mighty-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mighty-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -23626,8 +23078,7 @@
             "veyron_mighty"
         ],
         "name": "veyron_mighty-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mighty-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -23636,8 +23087,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_mighty-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_mighty-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -23648,8 +23098,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_minnie-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -23659,8 +23108,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "veyron_minnie-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_minnie-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -23677,8 +23125,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_minnie-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -23704,8 +23151,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_minnie-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -23738,7 +23184,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "veyron_minnie-payloads": {
         "_template": "payloads",
@@ -23760,8 +23206,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_minnie-release": {
         "_template": "release",
@@ -23769,8 +23214,7 @@
             "veyron_minnie"
         ],
         "name": "veyron_minnie-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_minnie-release-afdo": {
         "_template": "release-afdo-generate",
@@ -23785,8 +23229,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_minnie-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -23795,13 +23238,11 @@
                 ],
                 "grouped": true,
                 "name": "veyron_minnie-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "veyron_minnie-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_minnie-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -23809,8 +23250,7 @@
             "veyron_minnie"
         ],
         "name": "veyron_minnie-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_minnie-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -23818,8 +23258,7 @@
             "veyron_minnie"
         ],
         "name": "veyron_minnie-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_minnie-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -23828,8 +23267,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_minnie-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_minnie-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -23840,8 +23278,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_pinky-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -23851,8 +23288,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_pinky-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_pinky-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -23869,8 +23305,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_pinky-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -23896,8 +23331,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_pinky-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -23930,7 +23364,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "veyron_pinky-payloads": {
         "_template": "payloads",
@@ -23952,8 +23386,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_pinky-release": {
         "_template": "release",
@@ -23961,8 +23394,7 @@
             "veyron_pinky"
         ],
         "name": "veyron_pinky-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_pinky-release-afdo": {
         "_template": "release-afdo-generate",
@@ -23977,8 +23409,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_pinky-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -23987,13 +23418,11 @@
                 ],
                 "grouped": true,
                 "name": "veyron_pinky-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "veyron_pinky-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_pinky-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -24001,8 +23430,7 @@
             "veyron_pinky"
         ],
         "name": "veyron_pinky-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_pinky-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -24010,8 +23438,7 @@
             "veyron_pinky"
         ],
         "name": "veyron_pinky-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_pinky-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -24020,8 +23447,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_pinky-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_pinky-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -24032,8 +23458,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_rialto-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -24043,8 +23468,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "veyron_rialto-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_rialto-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -24061,8 +23485,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_rialto-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -24088,8 +23511,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_rialto-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -24122,7 +23544,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "veyron_rialto-payloads": {
         "_template": "payloads",
@@ -24144,8 +23566,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_rialto-release": {
         "_template": "release",
@@ -24155,8 +23576,7 @@
         "chrome_sdk": false,
         "name": "veyron_rialto-release",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_rialto-release-afdo": {
         "_template": "release-afdo-generate",
@@ -24171,8 +23591,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_rialto-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -24181,13 +23600,11 @@
                 ],
                 "grouped": true,
                 "name": "veyron_rialto-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "veyron_rialto-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_rialto-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -24195,8 +23612,7 @@
             "veyron_rialto"
         ],
         "name": "veyron_rialto-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_rialto-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -24204,8 +23620,7 @@
             "veyron_rialto"
         ],
         "name": "veyron_rialto-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_rialto-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -24214,8 +23629,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_rialto-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_rialto-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -24226,8 +23640,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_romy-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -24237,8 +23650,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "veyron_romy-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_romy-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -24255,8 +23667,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_romy-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -24282,8 +23693,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_romy-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -24316,7 +23726,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "veyron_romy-payloads": {
         "_template": "payloads",
@@ -24338,8 +23748,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_romy-release": {
         "_template": "release",
@@ -24348,8 +23757,7 @@
         ],
         "hw_tests": [],
         "name": "veyron_romy-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_romy-release-afdo": {
         "_template": "release-afdo-generate",
@@ -24364,8 +23772,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_romy-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -24374,13 +23781,11 @@
                 ],
                 "grouped": true,
                 "name": "veyron_romy-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "veyron_romy-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_romy-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -24388,8 +23793,7 @@
             "veyron_romy"
         ],
         "name": "veyron_romy-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_romy-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -24397,8 +23801,7 @@
             "veyron_romy"
         ],
         "name": "veyron_romy-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_romy-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -24407,8 +23810,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_romy-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_romy-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -24419,8 +23821,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_shark-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -24430,8 +23831,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "veyron_shark-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_shark-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -24448,8 +23848,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_shark-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -24475,8 +23874,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_shark-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -24509,7 +23907,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "veyron_shark-payloads": {
         "_template": "payloads",
@@ -24531,8 +23929,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_shark-release": {
         "_template": "release",
@@ -24540,8 +23937,7 @@
             "veyron_shark"
         ],
         "name": "veyron_shark-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_shark-release-afdo": {
         "_template": "release-afdo-generate",
@@ -24556,8 +23952,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_shark-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -24566,13 +23961,11 @@
                 ],
                 "grouped": true,
                 "name": "veyron_shark-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "veyron_shark-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_shark-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -24580,8 +23973,7 @@
             "veyron_shark"
         ],
         "name": "veyron_shark-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_shark-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -24589,8 +23981,7 @@
             "veyron_shark"
         ],
         "name": "veyron_shark-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_shark-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -24599,8 +23990,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_shark-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_shark-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -24611,8 +24001,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_speedy-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -24622,8 +24011,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "veyron_speedy-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_speedy-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -24640,8 +24028,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_speedy-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -24667,8 +24054,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_speedy-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -24701,7 +24087,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "veyron_speedy-payloads": {
         "_template": "payloads",
@@ -24723,8 +24109,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_speedy-release": {
         "_template": "release",
@@ -24732,8 +24117,7 @@
             "veyron_speedy"
         ],
         "name": "veyron_speedy-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_speedy-release-afdo": {
         "_template": "release-afdo-generate",
@@ -24748,8 +24132,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_speedy-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -24758,13 +24141,11 @@
                 ],
                 "grouped": true,
                 "name": "veyron_speedy-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "veyron_speedy-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_speedy-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -24772,8 +24153,7 @@
             "veyron_speedy"
         ],
         "name": "veyron_speedy-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_speedy-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -24781,8 +24161,7 @@
             "veyron_speedy"
         ],
         "name": "veyron_speedy-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_speedy-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -24791,8 +24170,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_speedy-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_speedy-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -24803,8 +24181,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_thea-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -24814,8 +24191,7 @@
         "important": false,
         "manifest": "official.xml",
         "name": "veyron_thea-chrome-pfq",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_thea-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -24832,8 +24208,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_thea-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -24859,8 +24234,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_thea-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -24893,7 +24267,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "veyron_thea-payloads": {
         "_template": "payloads",
@@ -24915,8 +24289,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_thea-release": {
         "_template": "release",
@@ -24924,8 +24297,7 @@
             "veyron_thea"
         ],
         "name": "veyron_thea-release",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_thea-release-afdo": {
         "_template": "release-afdo-generate",
@@ -24940,8 +24312,7 @@
                 ],
                 "grouped": true,
                 "name": "veyron_thea-release-afdo-generate",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             },
             {
                 "_template": "release-afdo-use",
@@ -24950,13 +24321,11 @@
                 ],
                 "grouped": true,
                 "name": "veyron_thea-release-afdo-use",
-                "vm_tests": [],
-                "vm_tests_supported": []
+                "vm_tests": []
             }
         ],
         "name": "veyron_thea-release-afdo",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_thea-release-afdo-generate": {
         "_template": "release-afdo-generate",
@@ -24964,8 +24333,7 @@
             "veyron_thea"
         ],
         "name": "veyron_thea-release-afdo-generate",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_thea-release-afdo-use": {
         "_template": "release-afdo-use",
@@ -24973,8 +24341,7 @@
             "veyron_thea"
         ],
         "name": "veyron_thea-release-afdo-use",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_thea-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -24983,8 +24350,7 @@
         ],
         "manifest": "official.xml",
         "name": "veyron_thea-tot-chrome-pfq-informational",
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "veyron_thea-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -24995,8 +24361,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "whirlwind-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -25008,8 +24373,7 @@
         "manifest": "official.xml",
         "name": "whirlwind-chrome-pfq",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "whirlwind-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -25028,8 +24392,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "whirlwind-compile-only-pre-cq": {
         "_template": "compile-only-pre-cq",
@@ -25058,8 +24421,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "whirlwind-no-vmtest-pre-cq": {
         "_template": "no-vmtest-pre-cq",
@@ -25095,7 +24457,7 @@
             "chrome_internal"
         ],
         "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests_override": null
     },
     "whirlwind-payloads": {
         "_template": "payloads",
@@ -25118,8 +24480,7 @@
         "useflags": [
             "chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "whirlwind-release": {
         "_template": "release",
@@ -25131,8 +24492,7 @@
         "hw_tests": [],
         "name": "whirlwind-release",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "whirlwind-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -25142,8 +24502,7 @@
         "manifest": "official.xml",
         "name": "whirlwind-tot-chrome-pfq-informational",
         "sync_chrome": false,
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "whirlwind-tot-chromium-pfq-informational": {
         "_template": "chromium-pfq-informational",
@@ -25155,8 +24514,7 @@
         "useflags": [
             "-chrome_internal"
         ],
-        "vm_tests": [],
-        "vm_tests_supported": []
+        "vm_tests": []
     },
     "winky-chrome-pfq": {
         "_template": "chrome-pfq",
@@ -26373,9 +25731,7 @@
         "important": false,
         "name": "x86-generic-asan-paladin",
         "profile": "asan",
-        "vm_tests_supported": [
-            "smoke_suite"
-        ]
+        "vm_tests_override": null
     },
     "x86-generic-chromium-pfq": {
         "_template": "chromium-pfq",
@@ -26470,9 +25826,6 @@
         "name": "x86-generic-telem-chromium-pfq-informational",
         "vm_tests": [
             "telemetry_suite"
-        ],
-        "vm_tests_supported": [
-            "telemetry_suite"
         ]
     },
     "x86-generic-telemetry": {
diff --git a/cbuildbot/config_lib.py b/cbuildbot/config_lib.py
index 4c076cf..2b93358 100644
--- a/cbuildbot/config_lib.py
+++ b/cbuildbot/config_lib.py
@@ -457,10 +457,9 @@
       vm_tests=[constants.SMOKE_SUITE_TEST_TYPE,
                 constants.SIMPLE_AU_TEST_TYPE],
 
-      # A list of all VM Tests the current build is capable of running if the
-      # command line forces VM Tests to run.
-      vm_tests_supported=[constants.SMOKE_SUITE_TEST_TYPE,
-                          constants.SIMPLE_AU_TEST_TYPE],
+      # A list of all VM Tests to use if VM Tests are forced on (--vmtest
+      # command line or trybot). None means no override.
+      vm_tests_override=None,
 
       # The number of times to run the VMTest stage. If this is >1, then we
       # will run the stage this many times, stopping if we encounter any