cheets_GTS(_R): Delete from public repo (and move to internal.)

BUG=b:191944948
TEST=build

Cq-Depend: chrome-internal:4166292, chromium:3205145
Change-Id: I7f88e2cc3d416ee31cef126584e3f0cb906553d9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3206981
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Jiyoun Ha <jiyounha@chromium.org>
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
diff --git a/server/cros/tradefed/generate_controlfiles_GTS.py b/server/cros/tradefed/generate_controlfiles_GTS.py
deleted file mode 100755
index a5c4521..0000000
--- a/server/cros/tradefed/generate_controlfiles_GTS.py
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/usr/bin/env python2
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import collections
-
-# The dashboard suppresses upload to APFE for GS directories (based on autotest
-# tag) that contain 'tradefed-run-collect-tests'. b/119640440
-# Do not change the name/tag without adjusting the dashboard.
-_COLLECT = 'tradefed-run-collect-tests-only-internal'
-_PUBLIC_COLLECT = 'tradefed-run-collect-tests-only'
-_ALL = 'all'
-
-CONFIG = {}
-
-CONFIG['TEST_NAME'] = 'cheets_GTS'
-CONFIG['DOC_TITLE'] = 'Android Google Test Suite (GTS)'
-CONFIG['MOBLAB_SUITE_NAME'] = 'suite:gts'
-CONFIG['COPYRIGHT_YEAR'] = 2016
-
-CONFIG['AUTHKEY'] = 'gs://chromeos-arc-images/cts/bundle/gts-arc.json'
-CONFIG['TRADEFED_IGNORE_BUSINESS_LOGIC_FAILURE'] = True
-
-CONFIG['LARGE_MAX_RESULT_SIZE'] = 500 * 1024
-CONFIG['NORMAL_MAX_RESULT_SIZE'] = 300 * 1024
-
-CONFIG['TRADEFED_CTS_COMMAND'] ='gts'
-CONFIG['TRADEFED_RETRY_COMMAND'] = 'retry'
-CONFIG['TRADEFED_DISABLE_REBOOT'] = False
-CONFIG['TRADEFED_DISABLE_REBOOT_ON_COLLECTION'] = True
-CONFIG['TRADEFED_MAY_SKIP_DEVICE_INFO'] = False
-CONFIG['NEEDS_DEVICE_INFO'] = []
-CONFIG['TRADEFED_EXECUTABLE_PATH'] = 'android-gts/tools/gts-tradefed'
-CONFIG['JAVA_EXECUTABLE_PATH'] = 'android-gts/jdk/bin/java'
-
-CONFIG['INTERNAL_SUITE_NAMES'] = ['suite:arc-gts']
-CONFIG['QUAL_SUITE_NAMES'] = ['suite:arc-gts-qual']
-
-CONFIG['CONTROLFILE_TEST_FUNCTION_NAME'] = 'run_TS'
-CONFIG['CONTROLFILE_WRITE_SIMPLE_QUAL_AND_REGRESS'] = False
-CONFIG['CONTROLFILE_WRITE_CAMERA'] = False
-CONFIG['CONTROLFILE_WRITE_EXTRA'] = True
-
-CONFIG['CTS_JOB_RETRIES_IN_PUBLIC'] = 2
-CONFIG['CTS_QUAL_RETRIES'] = 9
-CONFIG['CTS_MAX_RETRIES'] = {}
-
-# Timeout in hours.
-# Modules that run very long are encoded here.
-CONFIG['CTS_TIMEOUT_DEFAULT'] = 0.2
-CONFIG['CTS_TIMEOUT'] = {
-        'GtsAssistantMicHostTestCases': 0.5,
-        'GtsExoPlayerTestCases': 1.5,
-        'GtsExoPlayerTestCases.others': 1.5,
-        'GtsGmscoreHostTestCases': 1.0,
-        'GtsMediaTestCases': 4,
-        'GtsNetworkWatchlistTestCases': 1.0,
-        'GtsYouTubeTestCases': 1.0,
-        _ALL: 24,
-        _COLLECT: 1.0,
-        _PUBLIC_COLLECT: 1.0,
-}
-
-# Any test that runs as part as blocking BVT needs to be stable and fast. For
-# this reason we enforce a tight timeout on these modules/jobs.
-# Timeout in hours. (0.1h = 6 minutes)
-CONFIG['BVT_TIMEOUT'] = 0.1
-# We allow a very long runtime for qualification (1 day).
-CONFIG['QUAL_TIMEOUT'] = 24
-
-CONFIG['QUAL_BOOKMARKS'] = sorted([
-        'A',  # A bookend to simplify partition algorithm.
-        'GtsExoPlayerTestCases',
-        'GtsExoPlayerTestCasesz',  # TODO(b/178432852) runs GtsExo alone
-        'GtsMediaTestCases',
-        'GtsMediaTestCasesz',  # runs the biggest module in a single job.
-        'zzzzz'  # A bookend to simplify algorithm.
-])
-
-CONFIG['SMOKE'] = []
-
-CONFIG['BVT_ARC'] = []
-
-CONFIG['BVT_PERBUILD'] = [
-    'GtsAdminTestCases',
-    'GtsMemoryHostTestCases',
-    'GtsMemoryTestCases',
-    'GtsNetTestCases',
-    'GtsOsTestCases',
-    'GtsPlacementTestCases',
-    'GtsPrivacyTestCases',
-]
-
-CONFIG['NEEDS_POWER_CYCLE'] = []
-
-CONFIG['HARDWARE_DEPENDENT_MODULES'] = []
-
-CONFIG['VMTEST_INFO_SUITES'] = collections.OrderedDict()
-
-# Modules that are known to download and/or push media file assets.
-CONFIG['MEDIA_MODULES'] = ['GtsYouTubeTestCases']
-CONFIG['NEEDS_PUSH_MEDIA'] = CONFIG['MEDIA_MODULES'] + [_ALL]
-CONFIG['ENABLE_DEFAULT_APPS'] = []
-
-_MUTE_COMMAND = "\'cras_test_client --mute 1\'"
-# Preconditions applicable to internal tests.
-CONFIG['PRECONDITION'] = {
-        'GtsExoPlayerTestCases': [_MUTE_COMMAND],
-        'GtsMediaTestCases': [_MUTE_COMMAND],
-        'GtsYouTubeTestCases': [_MUTE_COMMAND],
-}
-CONFIG['LOGIN_PRECONDITION'] = {}
-
-CONFIG['LAB_DEPENDENCY'] = {}
-
-# Preconditions applicable to public tests.
-CONFIG['PUBLIC_PRECONDITION'] = {}
-CONFIG['PUBLIC_DEPENDENCIES'] = {}
-
-# This information is changed based on regular analysis of the failure rate on
-# partner moblabs.
-CONFIG['PUBLIC_MODULE_RETRY_COUNT'] = {
-  _ALL: 2,
-  'GtsExoPlayerTestCases': 5,  # TODO(b/149376356, b/164230246)
-  'GtsMediaTestCases': 5,  # TODO(b/140841434)
-  'GtsYouTubeTestCases': 5,  # TODO(b/149376356)
-}
-
-CONFIG['PUBLIC_OVERRIDE_TEST_PRIORITY'] = {
-    _PUBLIC_COLLECT: 70,
-}
-
-# This information is changed based on regular analysis of the job run time on
-# partner moblabs.
-
-CONFIG['OVERRIDE_TEST_LENGTH'] = {
-    'GtsMediaTestCases': 4,
-    _ALL: 4,
-    # Even though collect tests doesn't run very long, it must be the very first
-    # job executed inside of the suite. Hence it is the only 'LENGTHY' test.
-    _COLLECT: 5,  # LENGTHY
-}
-
-QUAL_REGRESSION_SUITES = ['suite:arc-gts-qual', 'suite:arc-gts']
-
-# Enabling --logcat-on-failure can extend total run time significantly if
-# individual tests finish in the order of 10ms or less (b/118836700). Specify
-# modules here to not enable the flag.
-CONFIG['DISABLE_LOGCAT_ON_FAILURE'] = set([])
-CONFIG['EXTRA_MODULES'] = {
-        'GtsExoPlayerTestCases': {
-                'GtsExoPlayerTestCases.cbc1': QUAL_REGRESSION_SUITES,
-                'GtsExoPlayerTestCases.cbcs': QUAL_REGRESSION_SUITES,
-                'GtsExoPlayerTestCases.cenc': QUAL_REGRESSION_SUITES,
-                'GtsExoPlayerTestCases.others': QUAL_REGRESSION_SUITES,
-        },
-}
-CONFIG['PUBLIC_EXTRA_MODULES'] = {
-        'GtsExoPlayerTestCases': {
-                'GtsExoPlayerTestCases.cbc1': [CONFIG['MOBLAB_SUITE_NAME']],
-                'GtsExoPlayerTestCases.cbcs': [CONFIG['MOBLAB_SUITE_NAME']],
-                'GtsExoPlayerTestCases.cenc': [CONFIG['MOBLAB_SUITE_NAME']],
-                'GtsExoPlayerTestCases.others': [CONFIG['MOBLAB_SUITE_NAME']],
-        }
-}
-CONFIG['EXTRA_SUBMODULE_OVERRIDE'] = {}
-CONFIG['EXTRA_COMMANDLINE'] = {
-        'GtsExoPlayerTestCases.cbc1': [
-                '--include-filter',
-                'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCbc1',
-        ],
-        'GtsExoPlayerTestCases.cbcs': [
-                '--include-filter',
-                'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCbcs',
-        ],
-        'GtsExoPlayerTestCases.cenc': [
-                '--include-filter',
-                'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCenc',
-        ],
-        'GtsExoPlayerTestCases.others': [
-                '--module',
-                'GtsExoPlayerTestCases',
-                '--exclude-filter',
-                'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCbc1',
-                '--exclude-filter',
-                'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCbcs',
-                '--exclude-filter',
-                'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCenc',
-        ],
-}
-CONFIG['EXTRA_ATTRIBUTES'] = {
-    'tradefed-run-collect-tests-only-internal': ['suite:arc-gts'],
-}
-CONFIG['EXTRA_ARTIFACTS'] = {}
-
-CONFIG['PREREQUISITES'] = {
-    'GtsGmscoreHostTestCases': ['bluetooth'],
-}
-CONFIG['USE_JDK9'] = True
-
-from generate_controlfiles_common import main
-
-if __name__ == '__main__':
-    main(CONFIG)
diff --git a/server/cros/tradefed/generate_controlfiles_GTS_R.py b/server/cros/tradefed/generate_controlfiles_GTS_R.py
deleted file mode 100755
index 6863246..0000000
--- a/server/cros/tradefed/generate_controlfiles_GTS_R.py
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/usr/bin/env python2
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import collections
-
-# The dashboard suppresses upload to APFE for GS directories (based on autotest
-# tag) that contain 'tradefed-run-collect-tests'. b/119640440
-# Do not change the name/tag without adjusting the dashboard.
-_COLLECT = 'tradefed-run-collect-tests-only-internal'
-_PUBLIC_COLLECT = 'tradefed-run-collect-tests-only'
-_ALL = 'all'
-
-CONFIG = {}
-
-CONFIG['TEST_NAME'] = 'cheets_GTS_R'
-CONFIG['DOC_TITLE'] = 'Android Google Test Suite (GTS)'
-CONFIG['MOBLAB_SUITE_NAME'] = 'suite:gts'
-CONFIG['COPYRIGHT_YEAR'] = 2020
-
-CONFIG['AUTHKEY'] = 'gs://chromeos-arc-images/cts/bundle/gts-arc.json'
-CONFIG['TRADEFED_IGNORE_BUSINESS_LOGIC_FAILURE'] = True
-
-CONFIG['LARGE_MAX_RESULT_SIZE'] = 500 * 1024
-CONFIG['NORMAL_MAX_RESULT_SIZE'] = 300 * 1024
-
-CONFIG['TRADEFED_CTS_COMMAND'] ='gts'
-CONFIG['TRADEFED_RETRY_COMMAND'] = 'retry'
-CONFIG['TRADEFED_DISABLE_REBOOT'] = False
-CONFIG['TRADEFED_DISABLE_REBOOT_ON_COLLECTION'] = True
-CONFIG['TRADEFED_MAY_SKIP_DEVICE_INFO'] = False
-CONFIG['NEEDS_DEVICE_INFO'] = []
-CONFIG['TRADEFED_EXECUTABLE_PATH'] = 'android-gts/tools/gts-tradefed'
-CONFIG['JAVA_EXECUTABLE_PATH'] = 'android-gts/jdk/bin/java'
-
-# For now only run as a part of arc-cts-r.
-# TODO(kinaba): move to arc-gts and arc-gts-qual after R
-# got out from the experimental state.
-CONFIG['INTERNAL_SUITE_NAMES'] = ['suite:arc-cts-r', 'suite:arc-gts']
-CONFIG['QUAL_SUITE_NAMES'] = ['suite:arc-gts-qual']
-
-CONFIG['CONTROLFILE_TEST_FUNCTION_NAME'] = 'run_TS'
-CONFIG['CONTROLFILE_WRITE_SIMPLE_QUAL_AND_REGRESS'] = False
-CONFIG['CONTROLFILE_WRITE_CAMERA'] = False
-CONFIG['CONTROLFILE_WRITE_EXTRA'] = False
-
-CONFIG['CTS_JOB_RETRIES_IN_PUBLIC'] = 2
-CONFIG['CTS_QUAL_RETRIES'] = 9
-CONFIG['CTS_MAX_RETRIES'] = {}
-
-# Timeout in hours.
-# Modules that run very long are encoded here.
-CONFIG['CTS_TIMEOUT_DEFAULT'] = 0.2
-CONFIG['CTS_TIMEOUT'] = {
-        'GtsBackupHostTestCases': 0.5,
-        'GtsExoPlayerTestCases': 1.5,
-        'GtsGmscoreHostTestCases': 1.0,
-        'GtsMediaTestCases': 10,
-        'GtsYouTubeTestCases': 1.0,
-        _ALL: 24,
-        _COLLECT: 0.5,
-        _PUBLIC_COLLECT: 0.5,
-}
-
-# Any test that runs as part as blocking BVT needs to be stable and fast. For
-# this reason we enforce a tight timeout on these modules/jobs.
-# Timeout in hours. (0.1h = 6 minutes)
-CONFIG['BVT_TIMEOUT'] = 0.1
-# We allow a very long runtime for qualification (1 day).
-CONFIG['QUAL_TIMEOUT'] = 24
-
-CONFIG['QUAL_BOOKMARKS'] = sorted([
-        'A',  # A bookend to simplify partition algorithm.
-        'GtsExoPlayerTestCases',
-        'GtsMediaTestCases',
-        'GtsMediaTestCasesz',  # runs the biggest module in a single job.
-        'zzzzz'  # A bookend to simplify algorithm.
-])
-
-CONFIG['SMOKE'] = []
-
-CONFIG['BVT_ARC'] = []
-
-CONFIG['BVT_PERBUILD'] = []
-
-CONFIG['NEEDS_POWER_CYCLE'] = []
-
-CONFIG['HARDWARE_DEPENDENT_MODULES'] = []
-
-CONFIG['VMTEST_INFO_SUITES'] = collections.OrderedDict()
-
-# Modules that are known to download and/or push media file assets.
-CONFIG['MEDIA_MODULES'] = ['GtsYouTubeTestCases']
-CONFIG['NEEDS_PUSH_MEDIA'] = CONFIG['MEDIA_MODULES'] + [_ALL]
-CONFIG['ENABLE_DEFAULT_APPS'] = []
-
-CONFIG['SPLIT_BY_BITS_MODULES'] = [
-        'GtsMediaTestCases',
-]
-CONFIG['PUBLIC_SPLIT_BY_BITS_MODULES'] = [
-        'GtsMediaTestCases',
-]
-
-_MUTE_COMMAND = "\'cras_test_client --mute 1\'"
-
-# Preconditions applicable to internal tests.
-CONFIG['PRECONDITION'] = {
-        'GtsExoPlayerTestCases': [_MUTE_COMMAND],
-        'GtsMediaTestCases': [_MUTE_COMMAND],
-        'GtsYouTubeTestCases': [_MUTE_COMMAND],
-}
-CONFIG['LOGIN_PRECONDITION'] = {}
-
-CONFIG['LAB_DEPENDENCY'] = {}
-
-# Preconditions applicable to public tests.
-CONFIG['PUBLIC_PRECONDITION'] = {}
-CONFIG['PUBLIC_DEPENDENCIES'] = {}
-
-# This information is changed based on regular analysis of the failure rate on
-# partner moblabs.
-CONFIG['PUBLIC_MODULE_RETRY_COUNT'] = {
-  _ALL: 2,
-  'GtsMediaTestCases': 5,  # TODO(b/140841434)
-  'GtsYouTubeTestCases': 5,  # TODO(b/149376356)
-}
-
-CONFIG['PUBLIC_OVERRIDE_TEST_PRIORITY'] = {
-    _PUBLIC_COLLECT: 70,
-}
-
-# This information is changed based on regular analysis of the job run time on
-# partner moblabs.
-
-CONFIG['OVERRIDE_TEST_LENGTH'] = {
-    'GtsMediaTestCases': 4,
-    _ALL: 4,
-    # Even though collect tests doesn't run very long, it must be the very first
-    # job executed inside of the suite. Hence it is the only 'LENGTHY' test.
-    _COLLECT: 5,  # LENGTHY
-}
-
-# Enabling --logcat-on-failure can extend total run time significantly if
-# individual tests finish in the order of 10ms or less (b/118836700). Specify
-# modules here to not enable the flag.
-CONFIG['DISABLE_LOGCAT_ON_FAILURE'] = set([])
-CONFIG['EXTRA_MODULES'] = {}
-CONFIG['PUBLIC_EXTRA_MODULES'] = {}
-CONFIG['EXTRA_SUBMODULE_OVERRIDE'] = {}
-CONFIG['EXTRA_COMMANDLINE'] = {}
-CONFIG['EXTRA_ATTRIBUTES'] = {
-    'tradefed-run-collect-tests-only-internal': ['suite:arc-gts'],
-}
-CONFIG['EXTRA_ARTIFACTS'] = {}
-
-CONFIG['PREREQUISITES'] = {
-    'GtsGmscoreHostTestCases': ['bluetooth'],
-}
-CONFIG['USE_JDK9'] = True
-
-from generate_controlfiles_common import main
-
-if __name__ == '__main__':
-    main(CONFIG)
diff --git a/server/site_tests/cheets_GTS/OWNERS b/server/site_tests/cheets_GTS/OWNERS
deleted file mode 100644
index 3895a7b..0000000
--- a/server/site_tests/cheets_GTS/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-include /CTS_OWNERS
diff --git a/server/site_tests/cheets_GTS/cheets_GTS.py b/server/site_tests/cheets_GTS/cheets_GTS.py
deleted file mode 100644
index c77a5d4..0000000
--- a/server/site_tests/cheets_GTS/cheets_GTS.py
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# repohooks/pre-upload.py currently does not run pylint. But for developers who
-# want to check their code manually we disable several harmless pylint warnings
-# which just distract from more serious remaining issues.
-#
-# The instance variable _android_gts is not defined in __init__().
-# pylint: disable=attribute-defined-outside-init
-#
-# Many short variable names don't follow the naming convention.
-# pylint: disable=invalid-name
-
-import logging
-import os
-import shutil
-import tempfile
-
-from autotest_lib.server import utils
-from autotest_lib.server.cros.tradefed import tradefed_test
-
-# Maximum default time allowed for each individual GTS module.
-_GTS_TIMEOUT_SECONDS = 3600
-_PARTNER_GTS_BUCKET = 'gs://chromeos-partner-gts/'
-_PARTNER_GTS_LOCATION = _PARTNER_GTS_BUCKET + 'android-gts-9-R1-P-7679548.zip'
-_PARTNER_GTS_AUTHKEY = _PARTNER_GTS_BUCKET + 'gts-arc.json'
-_GTS_MEDIA_URI = ('https://storage.googleapis.com/youtube-test-media/gts/' +
-                  'GtsYouTubeTestCases-media-1.2.zip')
-_GTS_MEDIA_LOCALPATH = '/tmp/android-gts-media/GtsYouTubeTestCases'
-
-# Internal uprev for all GTS modules.
-_GTS_LATEST_URI = 'gs://chromeos-arc-images/cts/bundle/android-gts-9-R1-P-7679548.zip'
-
-
-class cheets_GTS(tradefed_test.TradefedTest):
-    """Sets up tradefed to run GTS tests."""
-    version = 1
-
-    _SHARD_CMD = '--shard-count'
-
-    def _tradefed_retry_command(self, template, session_id):
-        """Build tradefed 'retry' command from template."""
-        cmd = []
-        for arg in template:
-            cmd.append(arg.format(session_id=session_id))
-        return cmd
-
-    def _tradefed_run_command(self, template):
-        """Build tradefed 'run' command from template."""
-        cmd = template[:]
-        # If we are running outside of the lab we can collect more data.
-        if not utils.is_in_container():
-            logging.info('Running outside of lab, adding extra debug options.')
-            cmd.append('--log-level-display=DEBUG')
-
-        return cmd
-
-    def _get_default_bundle_url(self, bundle):
-        return _PARTNER_GTS_LOCATION
-
-    def _get_latest_bundle_url(self, bundle):
-        return _GTS_LATEST_URI
-
-    def _get_default_authkey(self):
-        return _PARTNER_GTS_AUTHKEY
-
-    def _get_tradefed_base_dir(self):
-        return 'android-gts'
-
-    def _tradefed_cmd_path(self):
-        return os.path.join(self._repository, 'tools', 'gts-tradefed')
-
-    def _tradefed_env(self):
-        if self._authkey:
-            return dict(os.environ, APE_API_KEY=self._authkey)
-        return None
-
-    def run_once(self,
-                 test_name,
-                 run_template,
-                 retry_template=None,
-                 target_module=None,
-                 target_plan=None,
-                 needs_push_media=False,
-                 enable_default_apps=False,
-                 executable_test_count=None,
-                 precondition_commands=[],
-                 login_precondition_commands=[],
-                 authkey=None,
-                 prerequisites=[],
-                 timeout=_GTS_TIMEOUT_SECONDS):
-        """Runs the specified GTS once, but with several retries.
-
-        Run an arbitrary tradefed command.
-
-        @param test_name: the name of test. Used for logging.
-        @param run_template: the template to construct the run command.
-                             Example: ['run', 'commandAndExit', 'cts',
-                                       '--skip-media-download']
-        @param retry_template: the template to construct the retry command.
-                               Example: ['run', 'commandAndExit', 'retry',
-                                         '--skip-media-download', '--retry',
-                                         '{session_id}']
-        @param target_module: the name of test module to run.
-        @param target_plan: the name of the test plan to run.
-        @param needs_push_media: need to push test media streams.
-        @param executable_test_count: the known number of tests in the run.
-        @param timeout: time after which tradefed can be interrupted.
-        @param precondition_commands: a list of scripts to be run on the
-        dut before the test is run, the scripts must already be installed.
-        @param login_precondition_commands: a list of scripts to be run on the
-        dut before the log-in for the test is performed.
-        @param prerequisites: a list of prerequisites that identify rogue DUTs.
-        """
-        # Download the GTS auth key to the local temp directory.
-        tmpdir = tempfile.mkdtemp()
-        try:
-            self._authkey = self._download_to_dir(
-                authkey or self._get_default_authkey(), tmpdir)
-
-            self._run_tradefed_with_retries(
-                test_name=test_name,
-                run_template=run_template,
-                retry_template=retry_template,
-                timeout=timeout,
-                target_module=target_module,
-                target_plan=target_plan,
-                media_asset=tradefed_test.MediaAsset(
-                    _GTS_MEDIA_URI if needs_push_media else None,
-                    _GTS_MEDIA_LOCALPATH),
-                enable_default_apps=enable_default_apps,
-                executable_test_count=executable_test_count,
-                login_precondition_commands=login_precondition_commands,
-                precondition_commands=precondition_commands,
-                prerequisites=prerequisites)
-        finally:
-            shutil.rmtree(tmpdir)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.CtsEdiHost b/server/site_tests/cheets_GTS/control.9.0_r1.CtsEdiHost
deleted file mode 100644
index 9d42335..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.CtsEdiHost
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.CtsEdiHost'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module CtsEdiHostTestCases, CtsEdiHostTestCases[secondary_user] of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.CtsEdiHost',
-        test_name='cheets_GTS.9.0_r1.CtsEdiHost',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'CtsEdiHostTestCases', '--include-filter', 'CtsEdiHostTestCases[secondary_user]', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='CtsEdiHost',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAccountsHostTestCases
deleted file mode 100644
index c4be1ee..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsAccountsHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsAccountsHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAccountsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsAccountsHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsAccountsHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAccountsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAccountsHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsAdminTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAdminTestCases
deleted file mode 100644
index 5a24df2..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsAdminTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsAdminTestCases'
-ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAdminTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=3,
-        tag='9.0_r1.GtsAdminTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsAdminTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAdminTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAdminTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsAfwTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAfwTestCases
deleted file mode 100644
index a387782..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsAfwTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsAfwTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAfwTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsAfwTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsAfwTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAfwTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAfwTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsAndroidAutoDeviceTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAndroidAutoDeviceTestCases
deleted file mode 100644
index ae42910..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsAndroidAutoDeviceTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsAndroidAutoDeviceTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAndroidAutoDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsAndroidAutoDeviceTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsAndroidAutoDeviceTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAndroidAutoDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAndroidAutoDeviceTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsApp b/server/site_tests/cheets_GTS/control.9.0_r1.GtsApp
deleted file mode 100644
index c0f046c..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsApp
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsApp'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAppBlacklistDeviceTestCases, GtsAppTestCases, GtsAppVisibilityDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsApp',
-        test_name='cheets_GTS.9.0_r1.GtsApp',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsAppBlacklistDeviceTestCases', '--include-filter', 'GtsAppTestCases', '--include-filter', 'GtsAppVisibilityDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsApp',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1440)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsArtManagerHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsArtManagerHostTestCases
deleted file mode 100644
index 2e7c7d7..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsArtManagerHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsArtManagerHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsArtManagerHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsArtManagerHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsArtManagerHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsArtManagerHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsArtManagerHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsAssistIntentTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAssistIntentTestCases
deleted file mode 100644
index 66af3b7..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsAssistIntentTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsAssistIntentTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAssistIntentTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsAssistIntentTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsAssistIntentTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAssistIntentTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAssistIntentTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsAssistant b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAssistant
deleted file mode 100644
index c098f72..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsAssistant
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsAssistant'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAssistantHostTestCases, GtsAssistantMicHostTestCases, GtsAssistantWorkProfileHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsAssistant',
-        test_name='cheets_GTS.9.0_r1.GtsAssistant',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsAssistantHostTestCases', '--include-filter', 'GtsAssistantMicHostTestCases', '--include-filter', 'GtsAssistantWorkProfileHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAssistant',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=2880)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsAudioTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAudioTestCases
deleted file mode 100644
index 6e7113f..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsAudioTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsAudioTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAudioTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsAudioTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsAudioTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAudioTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAudioTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsBackup b/server/site_tests/cheets_GTS/control.9.0_r1.GtsBackup
deleted file mode 100644
index 3766e53..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsBackup
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsBackup'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsBackupHostTestCases, GtsBackupTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsBackup',
-        test_name='cheets_GTS.9.0_r1.GtsBackup',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsBackupHostTestCases', '--include-filter', 'GtsBackupTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsBackup',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsBoot b/server/site_tests/cheets_GTS/control.9.0_r1.GtsBoot
deleted file mode 100644
index e3c0b68..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsBoot
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsBoot'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsBootHealthHostTestCases, GtsBootStatsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsBoot',
-        test_name='cheets_GTS.9.0_r1.GtsBoot',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsBootHealthHostTestCases', '--include-filter', 'GtsBootStatsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsBoot',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsCNGCoreTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCNGCoreTestCases
deleted file mode 100644
index e200f6f..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsCNGCoreTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsCNGCoreTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCNGCoreTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsCNGCoreTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsCNGCoreTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCNGCoreTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCNGCoreTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsCalendarTests b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCalendarTests
deleted file mode 100644
index f871900..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsCalendarTests
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsCalendarTests'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCalendarTests of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsCalendarTests',
-        test_name='cheets_GTS.9.0_r1.GtsCalendarTests',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCalendarTests', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCalendarTests',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsCallLogTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCallLogTestCases
deleted file mode 100644
index a695359..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsCallLogTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsCallLogTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCallLogTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsCallLogTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsCallLogTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCallLogTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCallLogTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsCameraTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCameraTestCases
deleted file mode 100644
index 3998fd7..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsCameraTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsCameraTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCameraTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsCameraTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsCameraTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCameraTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCameraTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsCastHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCastHostTestCases
deleted file mode 100644
index d3a27a7..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsCastHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsCastHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCastHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsCastHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsCastHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCastHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCastHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsContacts b/server/site_tests/cheets_GTS/control.9.0_r1.GtsContacts
deleted file mode 100644
index f6e1662..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsContacts
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsContacts'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContactsAppDeviceTestCases, GtsContactsTest of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsContacts',
-        test_name='cheets_GTS.9.0_r1.GtsContacts',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsContactsAppDeviceTestCases', '--include-filter', 'GtsContactsTest', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContacts',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsContent b/server/site_tests/cheets_GTS/control.9.0_r1.GtsContent
deleted file mode 100644
index bd43298..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsContent
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsContent'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContentHostTestCases, GtsContentTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsContent',
-        test_name='cheets_GTS.9.0_r1.GtsContent',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsContentHostTestCases', '--include-filter', 'GtsContentTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContent',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsContextHubPermissionDeviceTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsContextHubPermissionDeviceTestCases
deleted file mode 100644
index b9cd841..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsContextHubPermissionDeviceTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsContextHubPermissionDeviceTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContextHubPermissionDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsContextHubPermissionDeviceTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsContextHubPermissionDeviceTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContextHubPermissionDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContextHubPermissionDeviceTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsDebugfsMountTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDebugfsMountTestCases
deleted file mode 100644
index 779415a..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsDebugfsMountTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsDebugfsMountTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDebugfsMountTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsDebugfsMountTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsDebugfsMountTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDebugfsMountTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDebugfsMountTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsDevice b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDevice
deleted file mode 100644
index 113246d..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsDevice
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsDevice'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDeviceConfigTestCases, GtsDevicePolicyHostTestCases, GtsDevicePolicyTestCases, GtsDevicePolicyTestCases[secondary_user] of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsDevice',
-        test_name='cheets_GTS.9.0_r1.GtsDevice',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsDeviceConfigTestCases', '--include-filter', 'GtsDevicePolicyHostTestCases', '--include-filter', 'GtsDevicePolicyTestCases', '--include-filter', 'GtsDevicePolicyTestCases[secondary_user]', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDevice',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1800)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsDexModuleRegistrationTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDexModuleRegistrationTestCases
deleted file mode 100644
index 7324ee7..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsDexModuleRegistrationTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsDexModuleRegistrationTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDexModuleRegistrationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsDexModuleRegistrationTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsDexModuleRegistrationTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDexModuleRegistrationTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDexModuleRegistrationTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsDialer b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDialer
deleted file mode 100644
index d17157d..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsDialer
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsDialer'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDialerAudioTestCases, GtsDialerDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsDialer',
-        test_name='cheets_GTS.9.0_r1.GtsDialer',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsDialerAudioTestCases', '--include-filter', 'GtsDialerDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDialer',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsDoze b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDoze
deleted file mode 100644
index 2ec0cc6..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsDoze
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsDoze'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDozeDeviceTestCases, GtsDozeHostSideTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsDoze',
-        test_name='cheets_GTS.9.0_r1.GtsDoze',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsDozeDeviceTestCases', '--include-filter', 'GtsDozeHostSideTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDoze',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsDuoReadyTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDuoReadyTestCases
deleted file mode 100644
index b5b358b..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsDuoReadyTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsDuoReadyTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDuoReadyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsDuoReadyTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsDuoReadyTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDuoReadyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDuoReadyTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsEdiHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsEdiHostTestCases
deleted file mode 100644
index a461162..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsEdiHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsEdiHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsEdiHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsEdiHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsEdiHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsEdiHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsEdiHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases
deleted file mode 100644
index 05cd577..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsExoPlayerTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsExoPlayerTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsExoPlayerTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsExoPlayerTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsExoPlayerTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsExoPlayerTestCases',
-        target_plan=None,
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=5400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases.cbc1 b/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases.cbc1
deleted file mode 100644
index 2b71a0f..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases.cbc1
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsExoPlayerTestCases.cbc1'
-ATTRIBUTES = 'suite:arc-gts-qual, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsExoPlayerTestCases.cbc1 of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='9.0_r1.GtsExoPlayerTestCases.cbc1',
-        test_name='cheets_GTS.9.0_r1.GtsExoPlayerTestCases.cbc1',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCbc1', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsExoPlayerTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases.cbcs b/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases.cbcs
deleted file mode 100644
index 4c612c1..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases.cbcs
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsExoPlayerTestCases.cbcs'
-ATTRIBUTES = 'suite:arc-gts-qual, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsExoPlayerTestCases.cbcs of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='9.0_r1.GtsExoPlayerTestCases.cbcs',
-        test_name='cheets_GTS.9.0_r1.GtsExoPlayerTestCases.cbcs',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCbcs', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsExoPlayerTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases.cenc b/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases.cenc
deleted file mode 100644
index 0935df5..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases.cenc
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsExoPlayerTestCases.cenc'
-ATTRIBUTES = 'suite:arc-gts-qual, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsExoPlayerTestCases.cenc of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='9.0_r1.GtsExoPlayerTestCases.cenc',
-        test_name='cheets_GTS.9.0_r1.GtsExoPlayerTestCases.cenc',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCenc', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsExoPlayerTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases.others b/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases.others
deleted file mode 100644
index 049ba16..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases.others
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsExoPlayerTestCases.others'
-ATTRIBUTES = 'suite:arc-gts-qual, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsExoPlayerTestCases.others of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='9.0_r1.GtsExoPlayerTestCases.others',
-        test_name='cheets_GTS.9.0_r1.GtsExoPlayerTestCases.others',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsExoPlayerTestCases', '--exclude-filter', 'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCbc1', '--exclude-filter', 'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCbcs', '--exclude-filter', 'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCenc', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsExoPlayerTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsFeaturesTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsFeaturesTestCases
deleted file mode 100644
index 3d14808..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsFeaturesTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsFeaturesTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsFeaturesTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsFeaturesTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsFeaturesTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFeaturesTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsFeaturesTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsFilesByGoogleTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsFilesByGoogleTestCases
deleted file mode 100644
index 1708d63..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsFilesByGoogleTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsFilesByGoogleTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsFilesByGoogleTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsFilesByGoogleTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsFilesByGoogleTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFilesByGoogleTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsFilesByGoogleTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsFontHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsFontHostTestCases
deleted file mode 100644
index c9584c3..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsFontHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsFontHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsFontHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsFontHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsFontHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFontHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsFontHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsGameOverlayTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsGameOverlayTestCases
deleted file mode 100644
index e5ebf7f..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsGameOverlayTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsGameOverlayTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameOverlayTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsGameOverlayTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsGameOverlayTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameOverlayTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameOverlayTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsGmscoreHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsGmscoreHostTestCases
deleted file mode 100644
index c942ffa..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsGmscoreHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsGmscoreHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGmscoreHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsGmscoreHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsGmscoreHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGmscoreHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGmscoreHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        prerequisites=['bluetooth'],
-        use_jdk9=True,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsGraphicsHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsGraphicsHostTestCases
deleted file mode 100644
index 17e1b3d..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsGraphicsHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsGraphicsHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGraphicsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsGraphicsHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsGraphicsHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGraphicsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGraphicsHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsHomeHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsHomeHostTestCases
deleted file mode 100644
index c10124b..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsHomeHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsHomeHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsHomeHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsHomeHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsHomeHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsHomeHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsHomeHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsIncident b/server/site_tests/cheets_GTS/control.9.0_r1.GtsIncident
deleted file mode 100644
index 7b32c3d..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsIncident
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsIncident'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncidentConfirmationTestCases, GtsIncidentManagerTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsIncident',
-        test_name='cheets_GTS.9.0_r1.GtsIncident',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsIncidentConfirmationTestCases', '--include-filter', 'GtsIncidentManagerTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncident',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsIncrementalInstall b/server/site_tests/cheets_GTS/control.9.0_r1.GtsIncrementalInstall
deleted file mode 100644
index 1c7b962..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsIncrementalInstall
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsIncrementalInstall'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncrementalInstallProxyHostTestCases, GtsIncrementalInstallTestCases, GtsIncrementalInstallTestCases_BackgroundProcess of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsIncrementalInstall',
-        test_name='cheets_GTS.9.0_r1.GtsIncrementalInstall',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsIncrementalInstallProxyHostTestCases', '--include-filter', 'GtsIncrementalInstallTestCases', '--include-filter', 'GtsIncrementalInstallTestCases_BackgroundProcess', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncrementalInstall',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1440)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases
deleted file mode 100644
index 4ab9703..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsInstallPackagesWhitelistDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallPackagesWhitelistDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallPackagesWhitelistDeviceTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsInstantAppsHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsInstantAppsHostTestCases
deleted file mode 100644
index c4a51af..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsInstantAppsHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsInstantAppsHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsInstantAppsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsInstantAppsHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsInstantAppsHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstantAppsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstantAppsHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsJniUncompressHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsJniUncompressHostTestCases
deleted file mode 100644
index f7d0f4d..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsJniUncompressHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsJniUncompressHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsJniUncompressHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsJniUncompressHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsJniUncompressHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsJniUncompressHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsJniUncompressHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsKidsHomeHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsKidsHomeHostTestCases
deleted file mode 100644
index f4cf242..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsKidsHomeHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsKidsHomeHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsKidsHomeHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsKidsHomeHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsKidsHomeHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsKidsHomeHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsKidsHomeHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsLargeApkHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsLargeApkHostTestCases
deleted file mode 100644
index 92db949..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsLargeApkHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsLargeApkHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLargeApkHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsLargeApkHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsLargeApkHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLargeApkHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLargeApkHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsLensTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsLensTestCases
deleted file mode 100644
index ba35701..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsLensTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsLensTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLensTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsLensTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsLensTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLensTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLensTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsLinkerConfig b/server/site_tests/cheets_GTS/control.9.0_r1.GtsLinkerConfig
deleted file mode 100644
index 7f9b00e..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsLinkerConfig
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsLinkerConfig'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLinkerConfigTestCases, GtsLinkerConfigTestCases[secondary_user] of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsLinkerConfig',
-        test_name='cheets_GTS.9.0_r1.GtsLinkerConfig',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsLinkerConfigTestCases', '--include-filter', 'GtsLinkerConfigTestCases[secondary_user]', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLinkerConfig',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsLocation b/server/site_tests/cheets_GTS/control.9.0_r1.GtsLocation
deleted file mode 100644
index adbb31d..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsLocation
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsLocation'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLocationHostTestCases, GtsLocationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsLocation',
-        test_name='cheets_GTS.9.0_r1.GtsLocation',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsLocationHostTestCases', '--include-filter', 'GtsLocationTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLocation',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsMbaPrivilegedPermissionTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsMbaPrivilegedPermissionTestCases
deleted file mode 100644
index a1c499b..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsMbaPrivilegedPermissionTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsMbaPrivilegedPermissionTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMbaPrivilegedPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsMbaPrivilegedPermissionTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsMbaPrivilegedPermissionTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMbaPrivilegedPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMbaPrivilegedPermissionTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsMediaTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsMediaTestCases
deleted file mode 100644
index 58776d0..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsMediaTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsMediaTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsMediaTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsMediaTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMediaTestCases',
-        target_plan=None,
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=14400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsMemory b/server/site_tests/cheets_GTS/control.9.0_r1.GtsMemory
deleted file mode 100644
index a1ec5dc..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsMemory
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsMemory'
-ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMemoryHostTestCases, GtsMemoryTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=3,
-        tag='9.0_r1.GtsMemory',
-        test_name='cheets_GTS.9.0_r1.GtsMemory',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsMemoryHostTestCases', '--include-filter', 'GtsMemoryTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMemory',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsModuleMetadataTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsModuleMetadataTestCases
deleted file mode 100644
index 1c98b56..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsModuleMetadataTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsModuleMetadataTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsModuleMetadataTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsModuleMetadataTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsModuleMetadataTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsModuleMetadataTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsModuleMetadataTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsNet b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNet
deleted file mode 100644
index 1fc5be3..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsNet
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsNet'
-ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNetStatsHostTestCases, GtsNetTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=3,
-        tag='9.0_r1.GtsNet',
-        test_name='cheets_GTS.9.0_r1.GtsNet',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsNetStatsHostTestCases', '--include-filter', 'GtsNetTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNet',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsNetwork b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNetwork
deleted file mode 100644
index 0759323..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsNetwork
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsNetwork'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNetworkStackHostTestCases, GtsNetworkWatchlistTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsNetwork',
-        test_name='cheets_GTS.9.0_r1.GtsNetwork',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsNetworkStackHostTestCases', '--include-filter', 'GtsNetworkWatchlistTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNetwork',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=4320)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsNmgiarcTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNmgiarcTestCases
deleted file mode 100644
index 168a069..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsNmgiarcTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsNmgiarcTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNmgiarcTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsNmgiarcTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsNmgiarcTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNmgiarcTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNmgiarcTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsNoPermission b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNoPermission
deleted file mode 100644
index 1d9c959..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsNoPermission
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsNoPermission'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNoPermissionTestCases, GtsNoPermissionTestCases25 of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsNoPermission',
-        test_name='cheets_GTS.9.0_r1.GtsNoPermission',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsNoPermissionTestCases', '--include-filter', 'GtsNoPermissionTestCases25', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNoPermission',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsNotificationTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNotificationTestCases
deleted file mode 100644
index 8390804..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsNotificationTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsNotificationTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNotificationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsNotificationTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsNotificationTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNotificationTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNotificationTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsOemLockServiceTestCases
deleted file mode 100644
index 14d41bd..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsOemLockServiceTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsOemLockServiceTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsOemLockServiceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsOemLockServiceTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsOemLockServiceTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsOemLockServiceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsOemLockServiceTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsOsTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsOsTestCases
deleted file mode 100644
index 72901e1..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsOsTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsOsTestCases'
-ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsOsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=3,
-        tag='9.0_r1.GtsOsTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsOsTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsOsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsOsTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPackage b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPackage
deleted file mode 100644
index 7c796c0..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPackage
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsPackage'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageInstallTestCases, GtsPackageInstallerTapjackingTestCases, GtsPackageManagerHostTestCases, GtsPackageNameCertPairsDeviceTestCases, GtsPackageRoleEnforcementTests, GtsPackageUninstallTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsPackage',
-        test_name='cheets_GTS.9.0_r1.GtsPackage',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsPackageInstallTestCases', '--include-filter', 'GtsPackageInstallerTapjackingTestCases', '--include-filter', 'GtsPackageManagerHostTestCases', '--include-filter', 'GtsPackageNameCertPairsDeviceTestCases', '--include-filter', 'GtsPackageRoleEnforcementTests', '--include-filter', 'GtsPackageUninstallTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPackage',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=2520)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPartnerBookmarksTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPartnerBookmarksTestCases
deleted file mode 100644
index b1256d0..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPartnerBookmarksTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsPartnerBookmarksTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPartnerBookmarksTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsPartnerBookmarksTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsPartnerBookmarksTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPartnerBookmarksTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPartnerBookmarksTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPermission b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPermission
deleted file mode 100644
index 1c412e9..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPermission
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsPermission'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPermissionControllerHostTestCases, GtsPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsPermission',
-        test_name='cheets_GTS.9.0_r1.GtsPermission',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsPermissionControllerHostTestCases', '--include-filter', 'GtsPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPermission',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPlacementTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPlacementTestCases
deleted file mode 100644
index fed66a0..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPlacementTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsPlacementTestCases'
-ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPlacementTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=3,
-        tag='9.0_r1.GtsPlacementTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsPlacementTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlacementTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPlacementTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPlay b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPlay
deleted file mode 100644
index 4428e72..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPlay
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsPlay'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPlayAutoInstallTestCases, GtsPlayFsiHostTestCases, GtsPlayFsiTestCases, GtsPlayStoreHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsPlay',
-        test_name='cheets_GTS.9.0_r1.GtsPlay',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsPlayAutoInstallTestCases', '--include-filter', 'GtsPlayFsiHostTestCases', '--include-filter', 'GtsPlayFsiTestCases', '--include-filter', 'GtsPlayStoreHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPlay',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1800)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPrintTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPrintTestCases
deleted file mode 100644
index 04d13ca..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPrintTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsPrintTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPrintTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsPrintTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsPrintTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrintTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPrintTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPrivacyTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPrivacyTestCases
deleted file mode 100644
index f81ab2c..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPrivacyTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsPrivacyTestCases'
-ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPrivacyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=3,
-        tag='9.0_r1.GtsPrivacyTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsPrivacyTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrivacyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPrivacyTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPropertiesTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPropertiesTestCases
deleted file mode 100644
index b330eaa..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsPropertiesTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsPropertiesTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPropertiesTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsPropertiesTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsPropertiesTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPropertiesTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPropertiesTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsRegulationComplianceTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsRegulationComplianceTestCases
deleted file mode 100644
index 1bbd8f8..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsRegulationComplianceTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsRegulationComplianceTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsRegulationComplianceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsRegulationComplianceTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsRegulationComplianceTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRegulationComplianceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsRegulationComplianceTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsRlzTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsRlzTestCases
deleted file mode 100644
index 53e653a..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsRlzTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsRlzTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsRlzTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsRlzTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsRlzTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRlzTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsRlzTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsRollbackManagerTest b/server/site_tests/cheets_GTS/control.9.0_r1.GtsRollbackManagerTest
deleted file mode 100644
index 2e705ca..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsRollbackManagerTest
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsRollbackManagerTest'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsRollbackManagerTest of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsRollbackManagerTest',
-        test_name='cheets_GTS.9.0_r1.GtsRollbackManagerTest',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRollbackManagerTest', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsRollbackManagerTest',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSample b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSample
deleted file mode 100644
index cbaf15d..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSample
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsSample'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSampleDeviceTestCases, GtsSampleDynamicConfigTestCases, GtsSampleHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSample',
-        test_name='cheets_GTS.9.0_r1.GtsSample',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSampleDeviceTestCases', '--include-filter', 'GtsSampleDynamicConfigTestCases', '--include-filter', 'GtsSampleHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSample',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1440)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsScreenshotHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsScreenshotHostTestCases
deleted file mode 100644
index 78ca6c9..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsScreenshotHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsScreenshotHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsScreenshotHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsScreenshotHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsScreenshotHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsScreenshotHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsScreenshotHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSearchHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSearchHostTestCases
deleted file mode 100644
index 7d8fd67..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSearchHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsSearchHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSearchHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSearchHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsSearchHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSearchHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSearchHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSecurityHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSecurityHostTestCases
deleted file mode 100644
index 73c4039..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSecurityHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsSecurityHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSecurityHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSecurityHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsSecurityHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSecurityHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSecurityHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSensorHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSensorHostTestCases
deleted file mode 100644
index 64c2d02..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSensorHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsSensorHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSensorHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSensorHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsSensorHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSensorHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSensorHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSettings b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSettings
deleted file mode 100644
index 299404a..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSettings
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsSettings'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSettingsHostTestCases, GtsSettingsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSettings',
-        test_name='cheets_GTS.9.0_r1.GtsSettings',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSettingsHostTestCases', '--include-filter', 'GtsSettingsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSettings',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSetupWizard b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSetupWizard
deleted file mode 100644
index 6f6d497..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSetupWizard
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsSetupWizard'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSetupWizardHostTestCases, GtsSetupWizardNoPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSetupWizard',
-        test_name='cheets_GTS.9.0_r1.GtsSetupWizard',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSetupWizardHostTestCases', '--include-filter', 'GtsSetupWizardNoPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSetupWizard',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSimAppDialogTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSimAppDialogTestCases
deleted file mode 100644
index 6657901..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSimAppDialogTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsSimAppDialogTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSimAppDialogTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSimAppDialogTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsSimAppDialogTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSimAppDialogTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSimAppDialogTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSmartBatteryDeviceTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSmartBatteryDeviceTestCases
deleted file mode 100644
index 821ffbe..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSmartBatteryDeviceTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsSmartBatteryDeviceTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSmartBatteryDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSmartBatteryDeviceTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsSmartBatteryDeviceTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSmartBatteryDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSmartBatteryDeviceTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSmsCallLogTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSmsCallLogTestCases
deleted file mode 100644
index e253b57..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSmsCallLogTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsSmsCallLogTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSmsCallLogTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSmsCallLogTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsSmsCallLogTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSmsCallLogTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSmsCallLogTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSpeechServicesTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSpeechServicesTestCases
deleted file mode 100644
index 339293c..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSpeechServicesTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsSpeechServicesTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSpeechServicesTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSpeechServicesTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsSpeechServicesTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSpeechServicesTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSpeechServicesTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSsaidHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSsaidHostTestCases
deleted file mode 100644
index bda1eab..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSsaidHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsSsaidHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSsaidHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSsaidHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsSsaidHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSsaidHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSsaidHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsStagedInstallHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsStagedInstallHostTestCases
deleted file mode 100644
index 8d4a847..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsStagedInstallHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsStagedInstallHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsStagedInstallHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsStagedInstallHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsStagedInstallHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStagedInstallHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsStagedInstallHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsStatsdHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsStatsdHostTestCases
deleted file mode 100644
index 42e8474..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsStatsdHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsStatsdHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsStatsdHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsStatsdHostTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsStatsdHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStatsdHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsStatsdHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsStorageTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsStorageTestCases
deleted file mode 100644
index 450d163..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsStorageTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsStorageTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsStorageTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsStorageTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsStorageTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStorageTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsStorageTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSupervisionTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSupervisionTestCases
deleted file mode 100644
index 48a0f3e..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSupervisionTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsSupervisionTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSupervisionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSupervisionTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsSupervisionTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSupervisionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSupervisionTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSuspendApps b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSuspendApps
deleted file mode 100644
index f61f2eb..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsSuspendApps
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsSuspendApps'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSuspendAppsPermissionTestCases, GtsSuspendAppsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSuspendApps',
-        test_name='cheets_GTS.9.0_r1.GtsSuspendApps',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSuspendAppsPermissionTestCases', '--include-filter', 'GtsSuspendAppsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSuspendApps',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsTelecomManagerTests b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTelecomManagerTests
deleted file mode 100644
index edf482f..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsTelecomManagerTests
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsTelecomManagerTests'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTelecomManagerTests of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsTelecomManagerTests',
-        test_name='cheets_GTS.9.0_r1.GtsTelecomManagerTests',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTelecomManagerTests', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTelecomManagerTests',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsTelephony b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTelephony
deleted file mode 100644
index 346e879..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsTelephony
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsTelephony'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTelephonyNumberVerificationHostCases, GtsTelephonyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsTelephony',
-        test_name='cheets_GTS.9.0_r1.GtsTelephony',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsTelephonyNumberVerificationHostCases', '--include-filter', 'GtsTelephonyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTelephony',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsTestHarnessModeTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTestHarnessModeTestCases
deleted file mode 100644
index 31836a3..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsTestHarnessModeTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsTestHarnessModeTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTestHarnessModeTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsTestHarnessModeTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsTestHarnessModeTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTestHarnessModeTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTestHarnessModeTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsTetheringTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTetheringTestCases
deleted file mode 100644
index abf381f..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsTetheringTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsTetheringTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTetheringTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsTetheringTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsTetheringTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTetheringTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTetheringTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsTv b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTv
deleted file mode 100644
index 1d9f9cc..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsTv
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsTv'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTvBugReportTestCases, GtsTvHostTestCases, GtsTvTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsTv',
-        test_name='cheets_GTS.9.0_r1.GtsTv',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsTvBugReportTestCases', '--include-filter', 'GtsTvHostTestCases', '--include-filter', 'GtsTvTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTv',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1440)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsUnofficialApisUsageTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsUnofficialApisUsageTestCases
deleted file mode 100644
index 605c7b8..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsUnofficialApisUsageTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsUnofficialApisUsageTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsUnofficialApisUsageTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsUnofficialApisUsageTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsUnofficialApisUsageTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUnofficialApisUsageTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsUnofficialApisUsageTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsUsageStatsTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsUsageStatsTestCases
deleted file mode 100644
index 74457c7..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsUsageStatsTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsUsageStatsTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsUsageStatsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsUsageStatsTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsUsageStatsTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUsageStatsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsUsageStatsTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsUserspaceRebootHostSideTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsUserspaceRebootHostSideTestCases
deleted file mode 100644
index 68c835a..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsUserspaceRebootHostSideTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsUserspaceRebootHostSideTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsUserspaceRebootHostSideTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsUserspaceRebootHostSideTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsUserspaceRebootHostSideTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUserspaceRebootHostSideTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsUserspaceRebootHostSideTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsViewTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsViewTestCases
deleted file mode 100644
index 2c6a845..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsViewTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsViewTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsViewTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsViewTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsViewTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsViewTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsViewTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsVndkDependencyTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsVndkDependencyTestCases
deleted file mode 100644
index 789e6a1..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsVndkDependencyTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsVndkDependencyTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsVndkDependencyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsVndkDependencyTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsVndkDependencyTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsVndkDependencyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsVndkDependencyTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsWebView b/server/site_tests/cheets_GTS/control.9.0_r1.GtsWebView
deleted file mode 100644
index 51bd1bd..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsWebView
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsWebView'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsWebViewHostTestCases, GtsWebViewTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsWebView',
-        test_name='cheets_GTS.9.0_r1.GtsWebView',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsWebViewHostTestCases', '--include-filter', 'GtsWebViewTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsWebView',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsWellbeing b/server/site_tests/cheets_GTS/control.9.0_r1.GtsWellbeing
deleted file mode 100644
index 3ca736d..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsWellbeing
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsWellbeing'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsWellbeingHostTestCases, GtsWellbeingPermissionPolicyTestCases, GtsWellbeingTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsWellbeing',
-        test_name='cheets_GTS.9.0_r1.GtsWellbeing',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsWellbeingHostTestCases', '--include-filter', 'GtsWellbeingPermissionPolicyTestCases', '--include-filter', 'GtsWellbeingTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsWellbeing',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1440)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsYouTubeTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsYouTubeTestCases
deleted file mode 100644
index d959a30..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.GtsYouTubeTestCases
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.GtsYouTubeTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsYouTubeTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        needs_push_media=True,
-        tag='9.0_r1.GtsYouTubeTestCases',
-        test_name='cheets_GTS.9.0_r1.GtsYouTubeTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsYouTubeTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsYouTubeTestCases',
-        target_plan=None,
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases
deleted file mode 100644
index a5d2f70..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases'
-ATTRIBUTES = 'suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module CtsEdiHostTestCases, CtsEdiHostTestCases[secondary_user], GtsAccountsHostTestCases, GtsAdminTestCases, GtsAfwTestCases, GtsAndroidAutoDeviceTestCases, GtsAppBlacklistDeviceTestCases, GtsAppTestCases, GtsAppVisibilityDeviceTestCases, GtsArtManagerHostTestCases, GtsAssistIntentTestCases, GtsAssistantHostTestCases, GtsAssistantMicHostTestCases, GtsAssistantWorkProfileHostTestCases, GtsAudioTestCases, GtsBackupHostTestCases, GtsBackupTestCases, GtsBootHealthHostTestCases, GtsBootStatsTestCases, GtsCNGCoreTestCases, GtsCalendarTests, GtsCallLogTestCases, GtsCameraTestCases, GtsCastHostTestCases, GtsContactsAppDeviceTestCases, GtsContactsTest, GtsContentHostTestCases, GtsContentTestCases, GtsContextHubPermissionDeviceTestCases, GtsDebugfsMountTestCases, GtsDeviceConfigTestCases, GtsDevicePolicyHostTestCases, GtsDevicePolicyTestCases, GtsDevicePolicyTestCases[secondary_user], GtsDexModuleRegistrationTestCases, GtsDialerAudioTestCases, GtsDialerDeviceTestCases, GtsDozeDeviceTestCases, GtsDozeHostSideTestCases, GtsDuoReadyTestCases, GtsEdiHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases',
-        test_name='cheets_GTS.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'CtsEdiHostTestCases', '--include-filter', 'CtsEdiHostTestCases[secondary_user]', '--include-filter', 'GtsAccountsHostTestCases', '--include-filter', 'GtsAdminTestCases', '--include-filter', 'GtsAfwTestCases', '--include-filter', 'GtsAndroidAutoDeviceTestCases', '--include-filter', 'GtsAppBlacklistDeviceTestCases', '--include-filter', 'GtsAppTestCases', '--include-filter', 'GtsAppVisibilityDeviceTestCases', '--include-filter', 'GtsArtManagerHostTestCases', '--include-filter', 'GtsAssistIntentTestCases', '--include-filter', 'GtsAssistantHostTestCases', '--include-filter', 'GtsAssistantMicHostTestCases', '--include-filter', 'GtsAssistantWorkProfileHostTestCases', '--include-filter', 'GtsAudioTestCases', '--include-filter', 'GtsBackupHostTestCases', '--include-filter', 'GtsBackupTestCases', '--include-filter', 'GtsBootHealthHostTestCases', '--include-filter', 'GtsBootStatsTestCases', '--include-filter', 'GtsCNGCoreTestCases', '--include-filter', 'GtsCalendarTests', '--include-filter', 'GtsCallLogTestCases', '--include-filter', 'GtsCameraTestCases', '--include-filter', 'GtsCastHostTestCases', '--include-filter', 'GtsContactsAppDeviceTestCases', '--include-filter', 'GtsContactsTest', '--include-filter', 'GtsContentHostTestCases', '--include-filter', 'GtsContentTestCases', '--include-filter', 'GtsContextHubPermissionDeviceTestCases', '--include-filter', 'GtsDebugfsMountTestCases', '--include-filter', 'GtsDeviceConfigTestCases', '--include-filter', 'GtsDevicePolicyHostTestCases', '--include-filter', 'GtsDevicePolicyTestCases', '--include-filter', 'GtsDevicePolicyTestCases[secondary_user]', '--include-filter', 'GtsDexModuleRegistrationTestCases', '--include-filter', 'GtsDialerAudioTestCases', '--include-filter', 'GtsDialerDeviceTestCases', '--include-filter', 'GtsDozeDeviceTestCases', '--include-filter', 'GtsDozeHostSideTestCases', '--include-filter', 'GtsDuoReadyTestCases', '--include-filter', 'GtsEdiHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='all.CtsEdiHostTestCases_-_GtsEdiHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsExoPlayerTestCases_-_GtsExoPlayerTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsExoPlayerTestCases_-_GtsExoPlayerTestCases
deleted file mode 100644
index 61bfe8e..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsExoPlayerTestCases_-_GtsExoPlayerTestCases
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.all.GtsExoPlayerTestCases_-_GtsExoPlayerTestCases'
-ATTRIBUTES = 'suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsExoPlayerTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='9.0_r1.all.GtsExoPlayerTestCases_-_GtsExoPlayerTestCases',
-        test_name='cheets_GTS.9.0_r1.all.GtsExoPlayerTestCases_-_GtsExoPlayerTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsExoPlayerTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='all.GtsExoPlayerTestCases_-_GtsExoPlayerTestCases',
-        target_plan=None,
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsFeaturesTestCases_-_GtsMbaPrivilegedPermissionTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsFeaturesTestCases_-_GtsMbaPrivilegedPermissionTestCases
deleted file mode 100644
index 272b5a5..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsFeaturesTestCases_-_GtsMbaPrivilegedPermissionTestCases
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.all.GtsFeaturesTestCases_-_GtsMbaPrivilegedPermissionTestCases'
-ATTRIBUTES = 'suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsFeaturesTestCases, GtsFilesByGoogleTestCases, GtsFontHostTestCases, GtsGameOverlayTestCases, GtsGmscoreHostTestCases, GtsGraphicsHostTestCases, GtsHomeHostTestCases, GtsIncidentConfirmationTestCases, GtsIncidentManagerTestCases, GtsIncrementalInstallProxyHostTestCases, GtsIncrementalInstallTestCases, GtsIncrementalInstallTestCases_BackgroundProcess, GtsInstallPackagesWhitelistDeviceTestCases, GtsInstantAppsHostTestCases, GtsJniUncompressHostTestCases, GtsKidsHomeHostTestCases, GtsLargeApkHostTestCases, GtsLensTestCases, GtsLinkerConfigTestCases, GtsLinkerConfigTestCases[secondary_user], GtsLocationHostTestCases, GtsLocationTestCases, GtsMbaPrivilegedPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='9.0_r1.all.GtsFeaturesTestCases_-_GtsMbaPrivilegedPermissionTestCases',
-        test_name='cheets_GTS.9.0_r1.all.GtsFeaturesTestCases_-_GtsMbaPrivilegedPermissionTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsFeaturesTestCases', '--include-filter', 'GtsFilesByGoogleTestCases', '--include-filter', 'GtsFontHostTestCases', '--include-filter', 'GtsGameOverlayTestCases', '--include-filter', 'GtsGmscoreHostTestCases', '--include-filter', 'GtsGraphicsHostTestCases', '--include-filter', 'GtsHomeHostTestCases', '--include-filter', 'GtsIncidentConfirmationTestCases', '--include-filter', 'GtsIncidentManagerTestCases', '--include-filter', 'GtsIncrementalInstallProxyHostTestCases', '--include-filter', 'GtsIncrementalInstallTestCases', '--include-filter', 'GtsIncrementalInstallTestCases_BackgroundProcess', '--include-filter', 'GtsInstallPackagesWhitelistDeviceTestCases', '--include-filter', 'GtsInstantAppsHostTestCases', '--include-filter', 'GtsJniUncompressHostTestCases', '--include-filter', 'GtsKidsHomeHostTestCases', '--include-filter', 'GtsLargeApkHostTestCases', '--include-filter', 'GtsLensTestCases', '--include-filter', 'GtsLinkerConfigTestCases', '--include-filter', 'GtsLinkerConfigTestCases[secondary_user]', '--include-filter', 'GtsLocationHostTestCases', '--include-filter', 'GtsLocationTestCases', '--include-filter', 'GtsMbaPrivilegedPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='all.GtsFeaturesTestCases_-_GtsMbaPrivilegedPermissionTestCases',
-        target_plan=None,
-        uri='LATEST',
-        prerequisites=['bluetooth'],
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases
deleted file mode 100644
index 7386313..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases'
-ATTRIBUTES = 'suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases',
-        test_name='cheets_GTS.9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='all.GtsMediaTestCases_-_GtsMediaTestCases',
-        target_plan=None,
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases
deleted file mode 100644
index fb437a3..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases'
-ATTRIBUTES = 'suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMemoryHostTestCases, GtsMemoryTestCases, GtsModuleMetadataTestCases, GtsNetStatsHostTestCases, GtsNetTestCases, GtsNetworkStackHostTestCases, GtsNetworkWatchlistTestCases, GtsNmgiarcTestCases, GtsNoPermissionTestCases, GtsNoPermissionTestCases25, GtsNotificationTestCases, GtsOemLockServiceTestCases, GtsOsTestCases, GtsPackageInstallTestCases, GtsPackageInstallerTapjackingTestCases, GtsPackageManagerHostTestCases, GtsPackageNameCertPairsDeviceTestCases, GtsPackageRoleEnforcementTests, GtsPackageUninstallTestCases, GtsPartnerBookmarksTestCases, GtsPermissionControllerHostTestCases, GtsPermissionTestCases, GtsPlacementTestCases, GtsPlayAutoInstallTestCases, GtsPlayFsiHostTestCases, GtsPlayFsiTestCases, GtsPlayStoreHostTestCases, GtsPrintTestCases, GtsPrivacyTestCases, GtsPropertiesTestCases, GtsRegulationComplianceTestCases, GtsRlzTestCases, GtsRollbackManagerTest, GtsSampleDeviceTestCases, GtsSampleDynamicConfigTestCases, GtsSampleHostTestCases, GtsScreenshotHostTestCases, GtsSearchHostTestCases, GtsSecurityHostTestCases, GtsSensorHostTestCases, GtsSettingsHostTestCases, GtsSettingsTestCases, GtsSetupWizardHostTestCases, GtsSetupWizardNoPermissionTestCases, GtsSimAppDialogTestCases, GtsSmartBatteryDeviceTestCases, GtsSmsCallLogTestCases, GtsSpeechServicesTestCases, GtsSsaidHostTestCases, GtsStagedInstallHostTestCases, GtsStatsdHostTestCases, GtsStorageTestCases, GtsSupervisionTestCases, GtsSuspendAppsPermissionTestCases, GtsSuspendAppsTestCases, GtsTelecomManagerTests, GtsTelephonyNumberVerificationHostCases, GtsTelephonyTestCases, GtsTestHarnessModeTestCases, GtsTetheringTestCases, GtsTvBugReportTestCases, GtsTvHostTestCases, GtsTvTestCases, GtsUnofficialApisUsageTestCases, GtsUsageStatsTestCases, GtsUserspaceRebootHostSideTestCases, GtsViewTestCases, GtsVndkDependencyTestCases, GtsWebViewHostTestCases, GtsWebViewTestCases, GtsWellbeingHostTestCases, GtsWellbeingPermissionPolicyTestCases, GtsWellbeingTestCases, GtsYouTubeTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        needs_push_media=True,
-        tag='9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases',
-        test_name='cheets_GTS.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsMemoryHostTestCases', '--include-filter', 'GtsMemoryTestCases', '--include-filter', 'GtsModuleMetadataTestCases', '--include-filter', 'GtsNetStatsHostTestCases', '--include-filter', 'GtsNetTestCases', '--include-filter', 'GtsNetworkStackHostTestCases', '--include-filter', 'GtsNetworkWatchlistTestCases', '--include-filter', 'GtsNmgiarcTestCases', '--include-filter', 'GtsNoPermissionTestCases', '--include-filter', 'GtsNoPermissionTestCases25', '--include-filter', 'GtsNotificationTestCases', '--include-filter', 'GtsOemLockServiceTestCases', '--include-filter', 'GtsOsTestCases', '--include-filter', 'GtsPackageInstallTestCases', '--include-filter', 'GtsPackageInstallerTapjackingTestCases', '--include-filter', 'GtsPackageManagerHostTestCases', '--include-filter', 'GtsPackageNameCertPairsDeviceTestCases', '--include-filter', 'GtsPackageRoleEnforcementTests', '--include-filter', 'GtsPackageUninstallTestCases', '--include-filter', 'GtsPartnerBookmarksTestCases', '--include-filter', 'GtsPermissionControllerHostTestCases', '--include-filter', 'GtsPermissionTestCases', '--include-filter', 'GtsPlacementTestCases', '--include-filter', 'GtsPlayAutoInstallTestCases', '--include-filter', 'GtsPlayFsiHostTestCases', '--include-filter', 'GtsPlayFsiTestCases', '--include-filter', 'GtsPlayStoreHostTestCases', '--include-filter', 'GtsPrintTestCases', '--include-filter', 'GtsPrivacyTestCases', '--include-filter', 'GtsPropertiesTestCases', '--include-filter', 'GtsRegulationComplianceTestCases', '--include-filter', 'GtsRlzTestCases', '--include-filter', 'GtsRollbackManagerTest', '--include-filter', 'GtsSampleDeviceTestCases', '--include-filter', 'GtsSampleDynamicConfigTestCases', '--include-filter', 'GtsSampleHostTestCases', '--include-filter', 'GtsScreenshotHostTestCases', '--include-filter', 'GtsSearchHostTestCases', '--include-filter', 'GtsSecurityHostTestCases', '--include-filter', 'GtsSensorHostTestCases', '--include-filter', 'GtsSettingsHostTestCases', '--include-filter', 'GtsSettingsTestCases', '--include-filter', 'GtsSetupWizardHostTestCases', '--include-filter', 'GtsSetupWizardNoPermissionTestCases', '--include-filter', 'GtsSimAppDialogTestCases', '--include-filter', 'GtsSmartBatteryDeviceTestCases', '--include-filter', 'GtsSmsCallLogTestCases', '--include-filter', 'GtsSpeechServicesTestCases', '--include-filter', 'GtsSsaidHostTestCases', '--include-filter', 'GtsStagedInstallHostTestCases', '--include-filter', 'GtsStatsdHostTestCases', '--include-filter', 'GtsStorageTestCases', '--include-filter', 'GtsSupervisionTestCases', '--include-filter', 'GtsSuspendAppsPermissionTestCases', '--include-filter', 'GtsSuspendAppsTestCases', '--include-filter', 'GtsTelecomManagerTests', '--include-filter', 'GtsTelephonyNumberVerificationHostCases', '--include-filter', 'GtsTelephonyTestCases', '--include-filter', 'GtsTestHarnessModeTestCases', '--include-filter', 'GtsTetheringTestCases', '--include-filter', 'GtsTvBugReportTestCases', '--include-filter', 'GtsTvHostTestCases', '--include-filter', 'GtsTvTestCases', '--include-filter', 'GtsUnofficialApisUsageTestCases', '--include-filter', 'GtsUsageStatsTestCases', '--include-filter', 'GtsUserspaceRebootHostSideTestCases', '--include-filter', 'GtsViewTestCases', '--include-filter', 'GtsVndkDependencyTestCases', '--include-filter', 'GtsWebViewHostTestCases', '--include-filter', 'GtsWebViewTestCases', '--include-filter', 'GtsWellbeingHostTestCases', '--include-filter', 'GtsWellbeingPermissionPolicyTestCases', '--include-filter', 'GtsWellbeingTestCases', '--include-filter', 'GtsYouTubeTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases',
-        target_plan=None,
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_GTS/control.9.0_r1.tradefed-run-collect-tests-only-internal
deleted file mode 100644
index 892b628..0000000
--- a/server/site_tests/cheets_GTS/control.9.0_r1.tradefed-run-collect-tests-only-internal
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.9.0_r1.tradefed-run-collect-tests-only-internal'
-ATTRIBUTES = 'suite:arc-gts, suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 0
-TEST_TYPE = 'server'
-TIME = 'LENGTHY'
-MAX_RESULT_SIZE_KB = 512000
-DOC = 'Run all of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=0,
-        tag='9.0_r1.tradefed-run-collect-tests-only-internal',
-        test_name='cheets_GTS.9.0_r1.tradefed-run-collect-tests-only-internal',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'GtsYouTubeTestCases:skip-media-download:true'],
-        retry_template=None,
-        target_module=None,
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.CtsEdiHostTestCases b/server/site_tests/cheets_GTS/control.CtsEdiHostTestCases
deleted file mode 100644
index 5a97bbd..0000000
--- a/server/site_tests/cheets_GTS/control.CtsEdiHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.CtsEdiHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module CtsEdiHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='CtsEdiHostTestCases',
-        test_name='cheets_GTS.CtsEdiHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'CtsEdiHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='CtsEdiHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases
deleted file mode 100644
index 5ccbabb..0000000
--- a/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsAccountsHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAccountsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAccountsHostTestCases',
-        test_name='cheets_GTS.GtsAccountsHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAccountsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAccountsHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAdminTestCases b/server/site_tests/cheets_GTS/control.GtsAdminTestCases
deleted file mode 100644
index 94fc116..0000000
--- a/server/site_tests/cheets_GTS/control.GtsAdminTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsAdminTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAdminTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAdminTestCases',
-        test_name='cheets_GTS.GtsAdminTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAdminTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAdminTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAfwTestCases b/server/site_tests/cheets_GTS/control.GtsAfwTestCases
deleted file mode 100644
index 5334947..0000000
--- a/server/site_tests/cheets_GTS/control.GtsAfwTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsAfwTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAfwTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAfwTestCases',
-        test_name='cheets_GTS.GtsAfwTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAfwTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAfwTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAndroidAutoDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsAndroidAutoDeviceTestCases
deleted file mode 100644
index 2c23763..0000000
--- a/server/site_tests/cheets_GTS/control.GtsAndroidAutoDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsAndroidAutoDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAndroidAutoDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAndroidAutoDeviceTestCases',
-        test_name='cheets_GTS.GtsAndroidAutoDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAndroidAutoDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAndroidAutoDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases
deleted file mode 100644
index 788a4b7..0000000
--- a/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsAppBlacklistDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAppBlacklistDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAppBlacklistDeviceTestCases',
-        test_name='cheets_GTS.GtsAppBlacklistDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAppBlacklistDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAppBlacklistDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAppTestCases b/server/site_tests/cheets_GTS/control.GtsAppTestCases
deleted file mode 100644
index dab852a..0000000
--- a/server/site_tests/cheets_GTS/control.GtsAppTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsAppTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAppTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAppTestCases',
-        test_name='cheets_GTS.GtsAppTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAppTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAppTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAppVisibilityDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsAppVisibilityDeviceTestCases
deleted file mode 100644
index dd9c886..0000000
--- a/server/site_tests/cheets_GTS/control.GtsAppVisibilityDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsAppVisibilityDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAppVisibilityDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAppVisibilityDeviceTestCases',
-        test_name='cheets_GTS.GtsAppVisibilityDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAppVisibilityDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAppVisibilityDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsArtManagerHostTestCases b/server/site_tests/cheets_GTS/control.GtsArtManagerHostTestCases
deleted file mode 100644
index 94fdb5e..0000000
--- a/server/site_tests/cheets_GTS/control.GtsArtManagerHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsArtManagerHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsArtManagerHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsArtManagerHostTestCases',
-        test_name='cheets_GTS.GtsArtManagerHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsArtManagerHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsArtManagerHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAssistIntentTestCases b/server/site_tests/cheets_GTS/control.GtsAssistIntentTestCases
deleted file mode 100644
index f2996c7..0000000
--- a/server/site_tests/cheets_GTS/control.GtsAssistIntentTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsAssistIntentTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAssistIntentTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAssistIntentTestCases',
-        test_name='cheets_GTS.GtsAssistIntentTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAssistIntentTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAssistIntentTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAssistantHostTestCases b/server/site_tests/cheets_GTS/control.GtsAssistantHostTestCases
deleted file mode 100644
index 04d9e0f..0000000
--- a/server/site_tests/cheets_GTS/control.GtsAssistantHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsAssistantHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAssistantHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAssistantHostTestCases',
-        test_name='cheets_GTS.GtsAssistantHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAssistantHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAssistantHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAssistantMicHostTestCases b/server/site_tests/cheets_GTS/control.GtsAssistantMicHostTestCases
deleted file mode 100644
index e684d2d..0000000
--- a/server/site_tests/cheets_GTS/control.GtsAssistantMicHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsAssistantMicHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAssistantMicHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAssistantMicHostTestCases',
-        test_name='cheets_GTS.GtsAssistantMicHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAssistantMicHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAssistantMicHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=1800)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAssistantWorkProfileHostTestCases b/server/site_tests/cheets_GTS/control.GtsAssistantWorkProfileHostTestCases
deleted file mode 100644
index 62c7aab..0000000
--- a/server/site_tests/cheets_GTS/control.GtsAssistantWorkProfileHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsAssistantWorkProfileHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAssistantWorkProfileHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAssistantWorkProfileHostTestCases',
-        test_name='cheets_GTS.GtsAssistantWorkProfileHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAssistantWorkProfileHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAssistantWorkProfileHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAudioTestCases b/server/site_tests/cheets_GTS/control.GtsAudioTestCases
deleted file mode 100644
index 5c973b3..0000000
--- a/server/site_tests/cheets_GTS/control.GtsAudioTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsAudioTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAudioTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAudioTestCases',
-        test_name='cheets_GTS.GtsAudioTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAudioTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAudioTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases b/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases
deleted file mode 100644
index ab18fb5..0000000
--- a/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsBackupHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsBackupHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsBackupHostTestCases',
-        test_name='cheets_GTS.GtsBackupHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsBackupHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsBackupHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsBackupTestCases b/server/site_tests/cheets_GTS/control.GtsBackupTestCases
deleted file mode 100644
index ddbda21..0000000
--- a/server/site_tests/cheets_GTS/control.GtsBackupTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsBackupTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsBackupTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsBackupTestCases',
-        test_name='cheets_GTS.GtsBackupTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsBackupTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsBackupTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsBootHealthHostTestCases b/server/site_tests/cheets_GTS/control.GtsBootHealthHostTestCases
deleted file mode 100644
index 5d7c657..0000000
--- a/server/site_tests/cheets_GTS/control.GtsBootHealthHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsBootHealthHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsBootHealthHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsBootHealthHostTestCases',
-        test_name='cheets_GTS.GtsBootHealthHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsBootHealthHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsBootHealthHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsBootStatsTestCases b/server/site_tests/cheets_GTS/control.GtsBootStatsTestCases
deleted file mode 100644
index 3b490d2..0000000
--- a/server/site_tests/cheets_GTS/control.GtsBootStatsTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsBootStatsTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsBootStatsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsBootStatsTestCases',
-        test_name='cheets_GTS.GtsBootStatsTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsBootStatsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsBootStatsTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsCNGCoreTestCases b/server/site_tests/cheets_GTS/control.GtsCNGCoreTestCases
deleted file mode 100644
index 88ba61c..0000000
--- a/server/site_tests/cheets_GTS/control.GtsCNGCoreTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsCNGCoreTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCNGCoreTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsCNGCoreTestCases',
-        test_name='cheets_GTS.GtsCNGCoreTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCNGCoreTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCNGCoreTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsCalendarTests b/server/site_tests/cheets_GTS/control.GtsCalendarTests
deleted file mode 100644
index 2b60864..0000000
--- a/server/site_tests/cheets_GTS/control.GtsCalendarTests
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsCalendarTests'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCalendarTests of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsCalendarTests',
-        test_name='cheets_GTS.GtsCalendarTests',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCalendarTests', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCalendarTests',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsCallLogTestCases b/server/site_tests/cheets_GTS/control.GtsCallLogTestCases
deleted file mode 100644
index 50aef7b..0000000
--- a/server/site_tests/cheets_GTS/control.GtsCallLogTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsCallLogTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCallLogTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsCallLogTestCases',
-        test_name='cheets_GTS.GtsCallLogTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCallLogTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCallLogTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsCameraTestCases b/server/site_tests/cheets_GTS/control.GtsCameraTestCases
deleted file mode 100644
index e02ad83..0000000
--- a/server/site_tests/cheets_GTS/control.GtsCameraTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsCameraTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCameraTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsCameraTestCases',
-        test_name='cheets_GTS.GtsCameraTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCameraTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCameraTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsCastHostTestCases b/server/site_tests/cheets_GTS/control.GtsCastHostTestCases
deleted file mode 100644
index a4aa291..0000000
--- a/server/site_tests/cheets_GTS/control.GtsCastHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsCastHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCastHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsCastHostTestCases',
-        test_name='cheets_GTS.GtsCastHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCastHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCastHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsContactsAppDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsContactsAppDeviceTestCases
deleted file mode 100644
index 5f17a8a..0000000
--- a/server/site_tests/cheets_GTS/control.GtsContactsAppDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsContactsAppDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContactsAppDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsContactsAppDeviceTestCases',
-        test_name='cheets_GTS.GtsContactsAppDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContactsAppDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContactsAppDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsContactsTest b/server/site_tests/cheets_GTS/control.GtsContactsTest
deleted file mode 100644
index e25dea3..0000000
--- a/server/site_tests/cheets_GTS/control.GtsContactsTest
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsContactsTest'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContactsTest of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsContactsTest',
-        test_name='cheets_GTS.GtsContactsTest',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContactsTest', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContactsTest',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsContentHostTestCases b/server/site_tests/cheets_GTS/control.GtsContentHostTestCases
deleted file mode 100644
index e20e8d9..0000000
--- a/server/site_tests/cheets_GTS/control.GtsContentHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsContentHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContentHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsContentHostTestCases',
-        test_name='cheets_GTS.GtsContentHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContentHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContentHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsContentTestCases b/server/site_tests/cheets_GTS/control.GtsContentTestCases
deleted file mode 100644
index 5e2a1ea..0000000
--- a/server/site_tests/cheets_GTS/control.GtsContentTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsContentTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContentTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsContentTestCases',
-        test_name='cheets_GTS.GtsContentTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContentTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContentTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsContextHubPermissionDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsContextHubPermissionDeviceTestCases
deleted file mode 100644
index 7793f3b..0000000
--- a/server/site_tests/cheets_GTS/control.GtsContextHubPermissionDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsContextHubPermissionDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContextHubPermissionDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsContextHubPermissionDeviceTestCases',
-        test_name='cheets_GTS.GtsContextHubPermissionDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContextHubPermissionDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContextHubPermissionDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsDebugfsMountTestCases b/server/site_tests/cheets_GTS/control.GtsDebugfsMountTestCases
deleted file mode 100644
index cc7710a..0000000
--- a/server/site_tests/cheets_GTS/control.GtsDebugfsMountTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsDebugfsMountTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDebugfsMountTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDebugfsMountTestCases',
-        test_name='cheets_GTS.GtsDebugfsMountTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDebugfsMountTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDebugfsMountTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsDeviceConfigTestCases b/server/site_tests/cheets_GTS/control.GtsDeviceConfigTestCases
deleted file mode 100644
index 1247ce7..0000000
--- a/server/site_tests/cheets_GTS/control.GtsDeviceConfigTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsDeviceConfigTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDeviceConfigTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDeviceConfigTestCases',
-        test_name='cheets_GTS.GtsDeviceConfigTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDeviceConfigTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDeviceConfigTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsDevicePolicyHostTestCases b/server/site_tests/cheets_GTS/control.GtsDevicePolicyHostTestCases
deleted file mode 100644
index 2004a13..0000000
--- a/server/site_tests/cheets_GTS/control.GtsDevicePolicyHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsDevicePolicyHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDevicePolicyHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDevicePolicyHostTestCases',
-        test_name='cheets_GTS.GtsDevicePolicyHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDevicePolicyHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDevicePolicyHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsDevicePolicyTestCases b/server/site_tests/cheets_GTS/control.GtsDevicePolicyTestCases
deleted file mode 100644
index 9db66be..0000000
--- a/server/site_tests/cheets_GTS/control.GtsDevicePolicyTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsDevicePolicyTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDevicePolicyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDevicePolicyTestCases',
-        test_name='cheets_GTS.GtsDevicePolicyTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDevicePolicyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDevicePolicyTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases b/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases
deleted file mode 100644
index db57da4..0000000
--- a/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsDexModuleRegistrationTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDexModuleRegistrationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDexModuleRegistrationTestCases',
-        test_name='cheets_GTS.GtsDexModuleRegistrationTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDexModuleRegistrationTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDexModuleRegistrationTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsDialerAudioTestCases b/server/site_tests/cheets_GTS/control.GtsDialerAudioTestCases
deleted file mode 100644
index 379a86b..0000000
--- a/server/site_tests/cheets_GTS/control.GtsDialerAudioTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsDialerAudioTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDialerAudioTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDialerAudioTestCases',
-        test_name='cheets_GTS.GtsDialerAudioTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDialerAudioTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDialerAudioTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsDialerDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsDialerDeviceTestCases
deleted file mode 100644
index b0a9479..0000000
--- a/server/site_tests/cheets_GTS/control.GtsDialerDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsDialerDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDialerDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDialerDeviceTestCases',
-        test_name='cheets_GTS.GtsDialerDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDialerDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDialerDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases
deleted file mode 100644
index 7ab4be7..0000000
--- a/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsDozeDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDozeDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDozeDeviceTestCases',
-        test_name='cheets_GTS.GtsDozeDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDozeDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDozeDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsDozeHostSideTestCases b/server/site_tests/cheets_GTS/control.GtsDozeHostSideTestCases
deleted file mode 100644
index e43f8b9..0000000
--- a/server/site_tests/cheets_GTS/control.GtsDozeHostSideTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsDozeHostSideTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDozeHostSideTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDozeHostSideTestCases',
-        test_name='cheets_GTS.GtsDozeHostSideTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDozeHostSideTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDozeHostSideTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsDuoReadyTestCases b/server/site_tests/cheets_GTS/control.GtsDuoReadyTestCases
deleted file mode 100644
index e765df1..0000000
--- a/server/site_tests/cheets_GTS/control.GtsDuoReadyTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsDuoReadyTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDuoReadyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDuoReadyTestCases',
-        test_name='cheets_GTS.GtsDuoReadyTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDuoReadyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDuoReadyTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases b/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases
deleted file mode 100644
index 4dcca56..0000000
--- a/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsEdiHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsEdiHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsEdiHostTestCases',
-        test_name='cheets_GTS.GtsEdiHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsEdiHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsEdiHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases b/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases
deleted file mode 100644
index d2db0cc..0000000
--- a/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsExoPlayerTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsExoPlayerTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=5,
-        tag='GtsExoPlayerTestCases',
-        test_name='cheets_GTS.GtsExoPlayerTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsExoPlayerTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsExoPlayerTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=5400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases.cbc1 b/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases.cbc1
deleted file mode 100644
index b82cebb..0000000
--- a/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases.cbc1
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsExoPlayerTestCases.cbc1'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsExoPlayerTestCases.cbc1 of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsExoPlayerTestCases.cbc1',
-        test_name='cheets_GTS.GtsExoPlayerTestCases.cbc1',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCbc1', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsExoPlayerTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases.cbcs b/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases.cbcs
deleted file mode 100644
index a89311e..0000000
--- a/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases.cbcs
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsExoPlayerTestCases.cbcs'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsExoPlayerTestCases.cbcs of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsExoPlayerTestCases.cbcs',
-        test_name='cheets_GTS.GtsExoPlayerTestCases.cbcs',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCbcs', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsExoPlayerTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases.cenc b/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases.cenc
deleted file mode 100644
index 3d85051..0000000
--- a/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases.cenc
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsExoPlayerTestCases.cenc'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsExoPlayerTestCases.cenc of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsExoPlayerTestCases.cenc',
-        test_name='cheets_GTS.GtsExoPlayerTestCases.cenc',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCenc', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsExoPlayerTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases.others b/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases.others
deleted file mode 100644
index 23f1ffc..0000000
--- a/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases.others
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsExoPlayerTestCases.others'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsExoPlayerTestCases.others of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsExoPlayerTestCases.others',
-        test_name='cheets_GTS.GtsExoPlayerTestCases.others',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsExoPlayerTestCases', '--exclude-filter', 'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCbc1', '--exclude-filter', 'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCbcs', '--exclude-filter', 'GtsExoPlayerTestCases com.google.android.exoplayer.gts.DashTest#testWidevineH264AdaptiveWithSeekingCenc', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsExoPlayerTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=5400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases b/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases
deleted file mode 100644
index 55e8c9a..0000000
--- a/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsFeaturesTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsFeaturesTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsFeaturesTestCases',
-        test_name='cheets_GTS.GtsFeaturesTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFeaturesTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsFeaturesTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsFilesByGoogleTestCases b/server/site_tests/cheets_GTS/control.GtsFilesByGoogleTestCases
deleted file mode 100644
index 98b935b..0000000
--- a/server/site_tests/cheets_GTS/control.GtsFilesByGoogleTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsFilesByGoogleTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsFilesByGoogleTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsFilesByGoogleTestCases',
-        test_name='cheets_GTS.GtsFilesByGoogleTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFilesByGoogleTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsFilesByGoogleTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsFontHostTestCases b/server/site_tests/cheets_GTS/control.GtsFontHostTestCases
deleted file mode 100644
index 965a62a..0000000
--- a/server/site_tests/cheets_GTS/control.GtsFontHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsFontHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsFontHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsFontHostTestCases',
-        test_name='cheets_GTS.GtsFontHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFontHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsFontHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsGameOverlayTestCases b/server/site_tests/cheets_GTS/control.GtsGameOverlayTestCases
deleted file mode 100644
index f4a505c..0000000
--- a/server/site_tests/cheets_GTS/control.GtsGameOverlayTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameOverlayTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameOverlayTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsGameOverlayTestCases',
-        test_name='cheets_GTS.GtsGameOverlayTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameOverlayTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameOverlayTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsGmscoreHostTestCases b/server/site_tests/cheets_GTS/control.GtsGmscoreHostTestCases
deleted file mode 100644
index 8626c73..0000000
--- a/server/site_tests/cheets_GTS/control.GtsGmscoreHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGmscoreHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGmscoreHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsGmscoreHostTestCases',
-        test_name='cheets_GTS.GtsGmscoreHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGmscoreHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGmscoreHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsGraphicsHostTestCases b/server/site_tests/cheets_GTS/control.GtsGraphicsHostTestCases
deleted file mode 100644
index 69a03f9..0000000
--- a/server/site_tests/cheets_GTS/control.GtsGraphicsHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGraphicsHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGraphicsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsGraphicsHostTestCases',
-        test_name='cheets_GTS.GtsGraphicsHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGraphicsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGraphicsHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases b/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases
deleted file mode 100644
index e9e6c0b..0000000
--- a/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsHomeHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsHomeHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsHomeHostTestCases',
-        test_name='cheets_GTS.GtsHomeHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsHomeHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsHomeHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsIncidentConfirmationTestCases b/server/site_tests/cheets_GTS/control.GtsIncidentConfirmationTestCases
deleted file mode 100644
index 99ad250..0000000
--- a/server/site_tests/cheets_GTS/control.GtsIncidentConfirmationTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsIncidentConfirmationTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncidentConfirmationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsIncidentConfirmationTestCases',
-        test_name='cheets_GTS.GtsIncidentConfirmationTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncidentConfirmationTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncidentConfirmationTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsIncidentManagerTestCases b/server/site_tests/cheets_GTS/control.GtsIncidentManagerTestCases
deleted file mode 100644
index b630b98..0000000
--- a/server/site_tests/cheets_GTS/control.GtsIncidentManagerTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsIncidentManagerTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncidentManagerTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsIncidentManagerTestCases',
-        test_name='cheets_GTS.GtsIncidentManagerTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncidentManagerTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncidentManagerTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsIncrementalInstallProxyHostTestCases b/server/site_tests/cheets_GTS/control.GtsIncrementalInstallProxyHostTestCases
deleted file mode 100644
index a9c2ce4..0000000
--- a/server/site_tests/cheets_GTS/control.GtsIncrementalInstallProxyHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsIncrementalInstallProxyHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncrementalInstallProxyHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsIncrementalInstallProxyHostTestCases',
-        test_name='cheets_GTS.GtsIncrementalInstallProxyHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncrementalInstallProxyHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncrementalInstallProxyHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTestCases b/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTestCases
deleted file mode 100644
index 7ae546b..0000000
--- a/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsIncrementalInstallTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncrementalInstallTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsIncrementalInstallTestCases',
-        test_name='cheets_GTS.GtsIncrementalInstallTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncrementalInstallTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncrementalInstallTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTestCases_BackgroundProcess b/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTestCases_BackgroundProcess
deleted file mode 100644
index 41f7e82..0000000
--- a/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTestCases_BackgroundProcess
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsIncrementalInstallTestCases_BackgroundProcess'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncrementalInstallTestCases_BackgroundProcess of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsIncrementalInstallTestCases_BackgroundProcess',
-        test_name='cheets_GTS.GtsIncrementalInstallTestCases_BackgroundProcess',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncrementalInstallTestCases_BackgroundProcess', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncrementalInstallTestCases_BackgroundProcess',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases
deleted file mode 100644
index c707d1f..0000000
--- a/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsInstallPackagesWhitelistDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsInstallPackagesWhitelistDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsInstallPackagesWhitelistDeviceTestCases',
-        test_name='cheets_GTS.GtsInstallPackagesWhitelistDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallPackagesWhitelistDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallPackagesWhitelistDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases b/server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases
deleted file mode 100644
index 5f6c7d5..0000000
--- a/server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsInstantAppsHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsInstantAppsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsInstantAppsHostTestCases',
-        test_name='cheets_GTS.GtsInstantAppsHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstantAppsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstantAppsHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsJniUncompressHostTestCases b/server/site_tests/cheets_GTS/control.GtsJniUncompressHostTestCases
deleted file mode 100644
index fc8b99d..0000000
--- a/server/site_tests/cheets_GTS/control.GtsJniUncompressHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsJniUncompressHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsJniUncompressHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsJniUncompressHostTestCases',
-        test_name='cheets_GTS.GtsJniUncompressHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsJniUncompressHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsJniUncompressHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsKidsHomeHostTestCases b/server/site_tests/cheets_GTS/control.GtsKidsHomeHostTestCases
deleted file mode 100644
index e0b98dc..0000000
--- a/server/site_tests/cheets_GTS/control.GtsKidsHomeHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsKidsHomeHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsKidsHomeHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsKidsHomeHostTestCases',
-        test_name='cheets_GTS.GtsKidsHomeHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsKidsHomeHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsKidsHomeHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases b/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases
deleted file mode 100644
index c3a3172..0000000
--- a/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsLargeApkHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLargeApkHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsLargeApkHostTestCases',
-        test_name='cheets_GTS.GtsLargeApkHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLargeApkHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLargeApkHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsLensTestCases b/server/site_tests/cheets_GTS/control.GtsLensTestCases
deleted file mode 100644
index 4a4be49..0000000
--- a/server/site_tests/cheets_GTS/control.GtsLensTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsLensTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLensTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsLensTestCases',
-        test_name='cheets_GTS.GtsLensTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLensTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLensTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsLinkerConfigTestCases b/server/site_tests/cheets_GTS/control.GtsLinkerConfigTestCases
deleted file mode 100644
index 1eadd96..0000000
--- a/server/site_tests/cheets_GTS/control.GtsLinkerConfigTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsLinkerConfigTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLinkerConfigTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsLinkerConfigTestCases',
-        test_name='cheets_GTS.GtsLinkerConfigTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLinkerConfigTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLinkerConfigTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases b/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases
deleted file mode 100644
index c8d5757..0000000
--- a/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsLocationHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLocationHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsLocationHostTestCases',
-        test_name='cheets_GTS.GtsLocationHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLocationHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLocationHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsLocationTestCases b/server/site_tests/cheets_GTS/control.GtsLocationTestCases
deleted file mode 100644
index 2b922a1..0000000
--- a/server/site_tests/cheets_GTS/control.GtsLocationTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsLocationTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLocationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsLocationTestCases',
-        test_name='cheets_GTS.GtsLocationTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLocationTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLocationTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsMbaPrivilegedPermissionTestCases b/server/site_tests/cheets_GTS/control.GtsMbaPrivilegedPermissionTestCases
deleted file mode 100644
index 499011a..0000000
--- a/server/site_tests/cheets_GTS/control.GtsMbaPrivilegedPermissionTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsMbaPrivilegedPermissionTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMbaPrivilegedPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsMbaPrivilegedPermissionTestCases',
-        test_name='cheets_GTS.GtsMbaPrivilegedPermissionTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMbaPrivilegedPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMbaPrivilegedPermissionTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsMediaTestCases b/server/site_tests/cheets_GTS/control.GtsMediaTestCases
deleted file mode 100644
index 6ab6379..0000000
--- a/server/site_tests/cheets_GTS/control.GtsMediaTestCases
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsMediaTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-PRIORITY = 50
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=5,
-        tag='GtsMediaTestCases',
-        test_name='cheets_GTS.GtsMediaTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMediaTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=14400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases b/server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases
deleted file mode 100644
index 35dee583..0000000
--- a/server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsMemoryHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMemoryHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsMemoryHostTestCases',
-        test_name='cheets_GTS.GtsMemoryHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMemoryHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMemoryHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsMemoryTestCases b/server/site_tests/cheets_GTS/control.GtsMemoryTestCases
deleted file mode 100644
index fc4c437..0000000
--- a/server/site_tests/cheets_GTS/control.GtsMemoryTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsMemoryTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMemoryTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsMemoryTestCases',
-        test_name='cheets_GTS.GtsMemoryTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMemoryTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMemoryTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsModuleMetadataTestCases b/server/site_tests/cheets_GTS/control.GtsModuleMetadataTestCases
deleted file mode 100644
index 3493dab..0000000
--- a/server/site_tests/cheets_GTS/control.GtsModuleMetadataTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsModuleMetadataTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsModuleMetadataTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsModuleMetadataTestCases',
-        test_name='cheets_GTS.GtsModuleMetadataTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsModuleMetadataTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsModuleMetadataTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsNetStatsHostTestCases b/server/site_tests/cheets_GTS/control.GtsNetStatsHostTestCases
deleted file mode 100644
index 4da51f0..0000000
--- a/server/site_tests/cheets_GTS/control.GtsNetStatsHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsNetStatsHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNetStatsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNetStatsHostTestCases',
-        test_name='cheets_GTS.GtsNetStatsHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNetStatsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNetStatsHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsNetTestCases b/server/site_tests/cheets_GTS/control.GtsNetTestCases
deleted file mode 100644
index 3b2bdd5..0000000
--- a/server/site_tests/cheets_GTS/control.GtsNetTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsNetTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNetTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNetTestCases',
-        test_name='cheets_GTS.GtsNetTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNetTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNetTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsNetworkStackHostTestCases b/server/site_tests/cheets_GTS/control.GtsNetworkStackHostTestCases
deleted file mode 100644
index ca74a4a..0000000
--- a/server/site_tests/cheets_GTS/control.GtsNetworkStackHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsNetworkStackHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNetworkStackHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNetworkStackHostTestCases',
-        test_name='cheets_GTS.GtsNetworkStackHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNetworkStackHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNetworkStackHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsNetworkWatchlistTestCases b/server/site_tests/cheets_GTS/control.GtsNetworkWatchlistTestCases
deleted file mode 100644
index ab25633..0000000
--- a/server/site_tests/cheets_GTS/control.GtsNetworkWatchlistTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsNetworkWatchlistTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNetworkWatchlistTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNetworkWatchlistTestCases',
-        test_name='cheets_GTS.GtsNetworkWatchlistTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNetworkWatchlistTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNetworkWatchlistTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases b/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases
deleted file mode 100644
index b61c34c..0000000
--- a/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsNmgiarcTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNmgiarcTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNmgiarcTestCases',
-        test_name='cheets_GTS.GtsNmgiarcTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNmgiarcTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNmgiarcTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases b/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases
deleted file mode 100644
index ce5060d..0000000
--- a/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsNoPermissionTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNoPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNoPermissionTestCases',
-        test_name='cheets_GTS.GtsNoPermissionTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNoPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNoPermissionTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases25 b/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases25
deleted file mode 100644
index 7b6ec57..0000000
--- a/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases25
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsNoPermissionTestCases25'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNoPermissionTestCases25 of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNoPermissionTestCases25',
-        test_name='cheets_GTS.GtsNoPermissionTestCases25',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNoPermissionTestCases25', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNoPermissionTestCases25',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsNotificationTestCases b/server/site_tests/cheets_GTS/control.GtsNotificationTestCases
deleted file mode 100644
index 1b663b0..0000000
--- a/server/site_tests/cheets_GTS/control.GtsNotificationTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsNotificationTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNotificationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNotificationTestCases',
-        test_name='cheets_GTS.GtsNotificationTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNotificationTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNotificationTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases
deleted file mode 100644
index 0e115a8..0000000
--- a/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsOemLockServiceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsOemLockServiceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsOemLockServiceTestCases',
-        test_name='cheets_GTS.GtsOemLockServiceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsOemLockServiceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsOemLockServiceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsOsTestCases b/server/site_tests/cheets_GTS/control.GtsOsTestCases
deleted file mode 100644
index 8147c4a..0000000
--- a/server/site_tests/cheets_GTS/control.GtsOsTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsOsTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsOsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsOsTestCases',
-        test_name='cheets_GTS.GtsOsTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsOsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsOsTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageInstallTestCases b/server/site_tests/cheets_GTS/control.GtsPackageInstallTestCases
deleted file mode 100644
index b0eb161..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPackageInstallTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPackageInstallTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageInstallTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPackageInstallTestCases',
-        test_name='cheets_GTS.GtsPackageInstallTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPackageInstallTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPackageInstallTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases b/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases
deleted file mode 100644
index c127601..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPackageInstallerTapjackingTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageInstallerTapjackingTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPackageInstallerTapjackingTestCases',
-        test_name='cheets_GTS.GtsPackageInstallerTapjackingTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPackageInstallerTapjackingTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPackageInstallerTapjackingTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases b/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases
deleted file mode 100644
index fcc34d5..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPackageManagerHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageManagerHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPackageManagerHostTestCases',
-        test_name='cheets_GTS.GtsPackageManagerHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPackageManagerHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPackageManagerHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases
deleted file mode 100644
index 0be8d14..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPackageNameCertPairsDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageNameCertPairsDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPackageNameCertPairsDeviceTestCases',
-        test_name='cheets_GTS.GtsPackageNameCertPairsDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPackageNameCertPairsDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPackageNameCertPairsDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageRoleEnforcementTests b/server/site_tests/cheets_GTS/control.GtsPackageRoleEnforcementTests
deleted file mode 100644
index 6ea6831..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPackageRoleEnforcementTests
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPackageRoleEnforcementTests'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageRoleEnforcementTests of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPackageRoleEnforcementTests',
-        test_name='cheets_GTS.GtsPackageRoleEnforcementTests',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPackageRoleEnforcementTests', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPackageRoleEnforcementTests',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageUninstallTestCases b/server/site_tests/cheets_GTS/control.GtsPackageUninstallTestCases
deleted file mode 100644
index e7b43bc..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPackageUninstallTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPackageUninstallTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageUninstallTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPackageUninstallTestCases',
-        test_name='cheets_GTS.GtsPackageUninstallTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPackageUninstallTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPackageUninstallTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases b/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases
deleted file mode 100644
index e43c32a..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPartnerBookmarksTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPartnerBookmarksTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPartnerBookmarksTestCases',
-        test_name='cheets_GTS.GtsPartnerBookmarksTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPartnerBookmarksTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPartnerBookmarksTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPermissionControllerHostTestCases b/server/site_tests/cheets_GTS/control.GtsPermissionControllerHostTestCases
deleted file mode 100644
index aa331eb..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPermissionControllerHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPermissionControllerHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPermissionControllerHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPermissionControllerHostTestCases',
-        test_name='cheets_GTS.GtsPermissionControllerHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPermissionControllerHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPermissionControllerHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPermissionTestCases b/server/site_tests/cheets_GTS/control.GtsPermissionTestCases
deleted file mode 100644
index a968b5d..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPermissionTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPermissionTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPermissionTestCases',
-        test_name='cheets_GTS.GtsPermissionTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPermissionTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPlacementTestCases b/server/site_tests/cheets_GTS/control.GtsPlacementTestCases
deleted file mode 100644
index 3ad25d0..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPlacementTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPlacementTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPlacementTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPlacementTestCases',
-        test_name='cheets_GTS.GtsPlacementTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlacementTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPlacementTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases b/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases
deleted file mode 100644
index 9e150fc..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPlayAutoInstallTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPlayAutoInstallTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPlayAutoInstallTestCases',
-        test_name='cheets_GTS.GtsPlayAutoInstallTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlayAutoInstallTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPlayAutoInstallTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPlayFsiHostTestCases b/server/site_tests/cheets_GTS/control.GtsPlayFsiHostTestCases
deleted file mode 100644
index f1650fb..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPlayFsiHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPlayFsiHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPlayFsiHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPlayFsiHostTestCases',
-        test_name='cheets_GTS.GtsPlayFsiHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlayFsiHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPlayFsiHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPlayFsiTestCases b/server/site_tests/cheets_GTS/control.GtsPlayFsiTestCases
deleted file mode 100644
index e303914..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPlayFsiTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPlayFsiTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPlayFsiTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPlayFsiTestCases',
-        test_name='cheets_GTS.GtsPlayFsiTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlayFsiTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPlayFsiTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases b/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases
deleted file mode 100644
index 50d388d..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPlayStoreHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPlayStoreHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPlayStoreHostTestCases',
-        test_name='cheets_GTS.GtsPlayStoreHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlayStoreHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPlayStoreHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPrintTestCases b/server/site_tests/cheets_GTS/control.GtsPrintTestCases
deleted file mode 100644
index cdca45a..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPrintTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPrintTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPrintTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPrintTestCases',
-        test_name='cheets_GTS.GtsPrintTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrintTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPrintTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases b/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases
deleted file mode 100644
index b312800..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPrivacyTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPrivacyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPrivacyTestCases',
-        test_name='cheets_GTS.GtsPrivacyTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrivacyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPrivacyTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPropertiesTestCases b/server/site_tests/cheets_GTS/control.GtsPropertiesTestCases
deleted file mode 100644
index fd8e01b..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPropertiesTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPropertiesTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPropertiesTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPropertiesTestCases',
-        test_name='cheets_GTS.GtsPropertiesTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPropertiesTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPropertiesTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsRegulationComplianceTestCases b/server/site_tests/cheets_GTS/control.GtsRegulationComplianceTestCases
deleted file mode 100644
index 5be3653..0000000
--- a/server/site_tests/cheets_GTS/control.GtsRegulationComplianceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsRegulationComplianceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsRegulationComplianceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsRegulationComplianceTestCases',
-        test_name='cheets_GTS.GtsRegulationComplianceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRegulationComplianceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsRegulationComplianceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsRlzTestCases b/server/site_tests/cheets_GTS/control.GtsRlzTestCases
deleted file mode 100644
index 63fa1e6..0000000
--- a/server/site_tests/cheets_GTS/control.GtsRlzTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsRlzTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsRlzTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsRlzTestCases',
-        test_name='cheets_GTS.GtsRlzTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRlzTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsRlzTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsRollbackManagerTest b/server/site_tests/cheets_GTS/control.GtsRollbackManagerTest
deleted file mode 100644
index fc3889f..0000000
--- a/server/site_tests/cheets_GTS/control.GtsRollbackManagerTest
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsRollbackManagerTest'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsRollbackManagerTest of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsRollbackManagerTest',
-        test_name='cheets_GTS.GtsRollbackManagerTest',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRollbackManagerTest', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsRollbackManagerTest',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases
deleted file mode 100644
index 564cf58..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSampleDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSampleDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSampleDeviceTestCases',
-        test_name='cheets_GTS.GtsSampleDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSampleDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSampleDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases b/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases
deleted file mode 100644
index 0cb0c07..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSampleDynamicConfigTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSampleDynamicConfigTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSampleDynamicConfigTestCases',
-        test_name='cheets_GTS.GtsSampleDynamicConfigTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSampleDynamicConfigTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSampleDynamicConfigTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases b/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases
deleted file mode 100644
index 64adaea..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSampleHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSampleHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSampleHostTestCases',
-        test_name='cheets_GTS.GtsSampleHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSampleHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSampleHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases b/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases
deleted file mode 100644
index 42d797f..0000000
--- a/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsScreenshotHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsScreenshotHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsScreenshotHostTestCases',
-        test_name='cheets_GTS.GtsScreenshotHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsScreenshotHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsScreenshotHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases b/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases
deleted file mode 100644
index 1df012f..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSearchHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSearchHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSearchHostTestCases',
-        test_name='cheets_GTS.GtsSearchHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSearchHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSearchHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases b/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases
deleted file mode 100644
index 2565f74..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSecurityHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSecurityHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSecurityHostTestCases',
-        test_name='cheets_GTS.GtsSecurityHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSecurityHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSecurityHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases b/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases
deleted file mode 100644
index 46cb513..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSensorHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSensorHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSensorHostTestCases',
-        test_name='cheets_GTS.GtsSensorHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSensorHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSensorHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSettingsHostTestCases b/server/site_tests/cheets_GTS/control.GtsSettingsHostTestCases
deleted file mode 100644
index ab2dff8..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSettingsHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSettingsHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSettingsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSettingsHostTestCases',
-        test_name='cheets_GTS.GtsSettingsHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSettingsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSettingsHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSettingsTestCases b/server/site_tests/cheets_GTS/control.GtsSettingsTestCases
deleted file mode 100644
index a19b65c..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSettingsTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSettingsTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSettingsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSettingsTestCases',
-        test_name='cheets_GTS.GtsSettingsTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSettingsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSettingsTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases b/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases
deleted file mode 100644
index 446e483..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSetupWizardHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSetupWizardHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSetupWizardHostTestCases',
-        test_name='cheets_GTS.GtsSetupWizardHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSetupWizardHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSetupWizardHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSetupWizardNoPermissionTestCases b/server/site_tests/cheets_GTS/control.GtsSetupWizardNoPermissionTestCases
deleted file mode 100644
index afb3882..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSetupWizardNoPermissionTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSetupWizardNoPermissionTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSetupWizardNoPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSetupWizardNoPermissionTestCases',
-        test_name='cheets_GTS.GtsSetupWizardNoPermissionTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSetupWizardNoPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSetupWizardNoPermissionTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSimAppDialogTestCases b/server/site_tests/cheets_GTS/control.GtsSimAppDialogTestCases
deleted file mode 100644
index 4d68e3c..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSimAppDialogTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSimAppDialogTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSimAppDialogTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSimAppDialogTestCases',
-        test_name='cheets_GTS.GtsSimAppDialogTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSimAppDialogTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSimAppDialogTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases
deleted file mode 100644
index b8f60bf..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSmartBatteryDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSmartBatteryDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSmartBatteryDeviceTestCases',
-        test_name='cheets_GTS.GtsSmartBatteryDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSmartBatteryDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSmartBatteryDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSmsCallLogTestCases b/server/site_tests/cheets_GTS/control.GtsSmsCallLogTestCases
deleted file mode 100644
index 8d389d5..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSmsCallLogTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSmsCallLogTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSmsCallLogTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSmsCallLogTestCases',
-        test_name='cheets_GTS.GtsSmsCallLogTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSmsCallLogTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSmsCallLogTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSpeechServicesTestCases b/server/site_tests/cheets_GTS/control.GtsSpeechServicesTestCases
deleted file mode 100644
index 967401c..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSpeechServicesTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSpeechServicesTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSpeechServicesTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSpeechServicesTestCases',
-        test_name='cheets_GTS.GtsSpeechServicesTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSpeechServicesTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSpeechServicesTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases b/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases
deleted file mode 100644
index dfcae6c..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSsaidHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSsaidHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSsaidHostTestCases',
-        test_name='cheets_GTS.GtsSsaidHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSsaidHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSsaidHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsStagedInstallHostTestCases b/server/site_tests/cheets_GTS/control.GtsStagedInstallHostTestCases
deleted file mode 100644
index d2e088b..0000000
--- a/server/site_tests/cheets_GTS/control.GtsStagedInstallHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsStagedInstallHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsStagedInstallHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsStagedInstallHostTestCases',
-        test_name='cheets_GTS.GtsStagedInstallHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStagedInstallHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsStagedInstallHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsStatsdHostTestCases b/server/site_tests/cheets_GTS/control.GtsStatsdHostTestCases
deleted file mode 100644
index 084ae65..0000000
--- a/server/site_tests/cheets_GTS/control.GtsStatsdHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsStatsdHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsStatsdHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsStatsdHostTestCases',
-        test_name='cheets_GTS.GtsStatsdHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStatsdHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsStatsdHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsStorageTestCases b/server/site_tests/cheets_GTS/control.GtsStorageTestCases
deleted file mode 100644
index 386cea8..0000000
--- a/server/site_tests/cheets_GTS/control.GtsStorageTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsStorageTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsStorageTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsStorageTestCases',
-        test_name='cheets_GTS.GtsStorageTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStorageTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsStorageTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSupervisionTestCases b/server/site_tests/cheets_GTS/control.GtsSupervisionTestCases
deleted file mode 100644
index f71479e..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSupervisionTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSupervisionTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSupervisionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSupervisionTestCases',
-        test_name='cheets_GTS.GtsSupervisionTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSupervisionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSupervisionTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSuspendAppsPermissionTestCases b/server/site_tests/cheets_GTS/control.GtsSuspendAppsPermissionTestCases
deleted file mode 100644
index c3419ca..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSuspendAppsPermissionTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSuspendAppsPermissionTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSuspendAppsPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSuspendAppsPermissionTestCases',
-        test_name='cheets_GTS.GtsSuspendAppsPermissionTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSuspendAppsPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSuspendAppsPermissionTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSuspendAppsTestCases b/server/site_tests/cheets_GTS/control.GtsSuspendAppsTestCases
deleted file mode 100644
index 39820d25..0000000
--- a/server/site_tests/cheets_GTS/control.GtsSuspendAppsTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsSuspendAppsTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSuspendAppsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSuspendAppsTestCases',
-        test_name='cheets_GTS.GtsSuspendAppsTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSuspendAppsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSuspendAppsTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests b/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests
deleted file mode 100644
index 58763db..0000000
--- a/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsTelecomManagerTests'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTelecomManagerTests of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTelecomManagerTests',
-        test_name='cheets_GTS.GtsTelecomManagerTests',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTelecomManagerTests', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTelecomManagerTests',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsTelephonyNumberVerificationHostCases b/server/site_tests/cheets_GTS/control.GtsTelephonyNumberVerificationHostCases
deleted file mode 100644
index c6cf032..0000000
--- a/server/site_tests/cheets_GTS/control.GtsTelephonyNumberVerificationHostCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsTelephonyNumberVerificationHostCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTelephonyNumberVerificationHostCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTelephonyNumberVerificationHostCases',
-        test_name='cheets_GTS.GtsTelephonyNumberVerificationHostCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTelephonyNumberVerificationHostCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTelephonyNumberVerificationHostCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsTelephonyTestCases b/server/site_tests/cheets_GTS/control.GtsTelephonyTestCases
deleted file mode 100644
index 47c5e27..0000000
--- a/server/site_tests/cheets_GTS/control.GtsTelephonyTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsTelephonyTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTelephonyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTelephonyTestCases',
-        test_name='cheets_GTS.GtsTelephonyTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTelephonyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTelephonyTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsTestHarnessModeTestCases b/server/site_tests/cheets_GTS/control.GtsTestHarnessModeTestCases
deleted file mode 100644
index 2f2c8eb..0000000
--- a/server/site_tests/cheets_GTS/control.GtsTestHarnessModeTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsTestHarnessModeTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTestHarnessModeTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTestHarnessModeTestCases',
-        test_name='cheets_GTS.GtsTestHarnessModeTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTestHarnessModeTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTestHarnessModeTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsTetheringTestCases b/server/site_tests/cheets_GTS/control.GtsTetheringTestCases
deleted file mode 100644
index 858a5ef..0000000
--- a/server/site_tests/cheets_GTS/control.GtsTetheringTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsTetheringTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTetheringTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTetheringTestCases',
-        test_name='cheets_GTS.GtsTetheringTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTetheringTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTetheringTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases b/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases
deleted file mode 100644
index caa8c1f..0000000
--- a/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsTvBugReportTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTvBugReportTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTvBugReportTestCases',
-        test_name='cheets_GTS.GtsTvBugReportTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTvBugReportTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTvBugReportTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsTvHostTestCases b/server/site_tests/cheets_GTS/control.GtsTvHostTestCases
deleted file mode 100644
index dedf9f7..0000000
--- a/server/site_tests/cheets_GTS/control.GtsTvHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsTvHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTvHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTvHostTestCases',
-        test_name='cheets_GTS.GtsTvHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTvHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTvHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsTvTestCases b/server/site_tests/cheets_GTS/control.GtsTvTestCases
deleted file mode 100644
index 17bfb48..0000000
--- a/server/site_tests/cheets_GTS/control.GtsTvTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsTvTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTvTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTvTestCases',
-        test_name='cheets_GTS.GtsTvTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTvTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTvTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsUnofficialApisUsageTestCases b/server/site_tests/cheets_GTS/control.GtsUnofficialApisUsageTestCases
deleted file mode 100644
index 4c30484..0000000
--- a/server/site_tests/cheets_GTS/control.GtsUnofficialApisUsageTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsUnofficialApisUsageTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsUnofficialApisUsageTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsUnofficialApisUsageTestCases',
-        test_name='cheets_GTS.GtsUnofficialApisUsageTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUnofficialApisUsageTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsUnofficialApisUsageTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsUsageStatsTestCases b/server/site_tests/cheets_GTS/control.GtsUsageStatsTestCases
deleted file mode 100644
index cd95f0e..0000000
--- a/server/site_tests/cheets_GTS/control.GtsUsageStatsTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsUsageStatsTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsUsageStatsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsUsageStatsTestCases',
-        test_name='cheets_GTS.GtsUsageStatsTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUsageStatsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsUsageStatsTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsUserspaceRebootHostSideTestCases b/server/site_tests/cheets_GTS/control.GtsUserspaceRebootHostSideTestCases
deleted file mode 100644
index c653bb2..0000000
--- a/server/site_tests/cheets_GTS/control.GtsUserspaceRebootHostSideTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsUserspaceRebootHostSideTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsUserspaceRebootHostSideTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsUserspaceRebootHostSideTestCases',
-        test_name='cheets_GTS.GtsUserspaceRebootHostSideTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUserspaceRebootHostSideTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsUserspaceRebootHostSideTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsViewTestCases b/server/site_tests/cheets_GTS/control.GtsViewTestCases
deleted file mode 100644
index 7d32d46..0000000
--- a/server/site_tests/cheets_GTS/control.GtsViewTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsViewTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsViewTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsViewTestCases',
-        test_name='cheets_GTS.GtsViewTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsViewTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsViewTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsVndkDependencyTestCases b/server/site_tests/cheets_GTS/control.GtsVndkDependencyTestCases
deleted file mode 100644
index b9080c5..0000000
--- a/server/site_tests/cheets_GTS/control.GtsVndkDependencyTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsVndkDependencyTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsVndkDependencyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsVndkDependencyTestCases',
-        test_name='cheets_GTS.GtsVndkDependencyTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsVndkDependencyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsVndkDependencyTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases b/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases
deleted file mode 100644
index 6546112..0000000
--- a/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsWebViewHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsWebViewHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsWebViewHostTestCases',
-        test_name='cheets_GTS.GtsWebViewHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsWebViewHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsWebViewHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsWebViewTestCases b/server/site_tests/cheets_GTS/control.GtsWebViewTestCases
deleted file mode 100644
index 8582559..0000000
--- a/server/site_tests/cheets_GTS/control.GtsWebViewTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsWebViewTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsWebViewTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsWebViewTestCases',
-        test_name='cheets_GTS.GtsWebViewTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsWebViewTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsWebViewTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsWellbeingHostTestCases b/server/site_tests/cheets_GTS/control.GtsWellbeingHostTestCases
deleted file mode 100644
index 9ae65dd..0000000
--- a/server/site_tests/cheets_GTS/control.GtsWellbeingHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsWellbeingHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsWellbeingHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsWellbeingHostTestCases',
-        test_name='cheets_GTS.GtsWellbeingHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsWellbeingHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsWellbeingHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsWellbeingPermissionPolicyTestCases b/server/site_tests/cheets_GTS/control.GtsWellbeingPermissionPolicyTestCases
deleted file mode 100644
index 3283fa1..0000000
--- a/server/site_tests/cheets_GTS/control.GtsWellbeingPermissionPolicyTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsWellbeingPermissionPolicyTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsWellbeingPermissionPolicyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsWellbeingPermissionPolicyTestCases',
-        test_name='cheets_GTS.GtsWellbeingPermissionPolicyTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsWellbeingPermissionPolicyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsWellbeingPermissionPolicyTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsWellbeingTestCases b/server/site_tests/cheets_GTS/control.GtsWellbeingTestCases
deleted file mode 100644
index 0a35c4a..0000000
--- a/server/site_tests/cheets_GTS/control.GtsWellbeingTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsWellbeingTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsWellbeingTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsWellbeingTestCases',
-        test_name='cheets_GTS.GtsWellbeingTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsWellbeingTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsWellbeingTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsYouTubeTestCases b/server/site_tests/cheets_GTS/control.GtsYouTubeTestCases
deleted file mode 100644
index 35642fe..0000000
--- a/server/site_tests/cheets_GTS/control.GtsYouTubeTestCases
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsYouTubeTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsYouTubeTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=5,
-        needs_push_media=True,
-        tag='GtsYouTubeTestCases',
-        test_name='cheets_GTS.GtsYouTubeTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsYouTubeTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsYouTubeTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only b/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only
deleted file mode 100644
index 3cfa012..0000000
--- a/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.tradefed-run-collect-tests-only'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-PRIORITY = 70
-DOC = 'Run all of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=0,
-        tag='tradefed-run-collect-tests-only',
-        test_name='cheets_GTS.tradefed-run-collect-tests-only',
-        run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'GtsYouTubeTestCases:skip-media-download:true'],
-        retry_template=None,
-        target_module=None,
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.tradefed-run-test b/server/site_tests/cheets_GTS/control.tradefed-run-test
deleted file mode 100644
index dc5a268..0000000
--- a/server/site_tests/cheets_GTS/control.tradefed-run-test
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2019 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file is not auto-generated. Don't delete it.
-
-# Boring.
-import logging
-import pprint
-from autotest_lib.client.bin import utils
-
-usage = """
-1) To run agains a particular $DUT use
-   test_that --args="module=GtsMediaTestCases test=com.google.android.media.gts.MediaCodecStressTest#testDecodeDecodeCompositeDisplay1080p" $DUT cheets_GTS.tradefed-run-test
-
-2) To run against a lab pool use
-    run_suite.py --board=eve --build=$TRYJOB_BUILD --suite_name arc-gts-test --pool cts --no_wait True --priority CQ --timeout_mins 6160 --retry False --num 1 --suite_min_duts 1 --test_args="{'module' : 'GtsMediaTestCases', 'test' : 'com.google.android.media.gts.MediaCodecStressTest#testDecodeDecodeCompositeDisplay1080p'}"
-"""
-
-def usage_error():
-    logging.info('Example usage:')
-    logging.info(usage)
-    raise SystemExit
-
-pp = pprint.PrettyPrinter()
-logging.info(
-    '***********************************************************************')
-
-# Define the variables that we are going to use and set sensible defaults.
-gts_module = ''
-gts_retry = 5
-gts_revision = None
-gts_test = ''
-gts_timeout = 3600
-
-# Pull parameters either from run_suite or test_that.
-if 'args_dict' in vars():
-    logging.info('Raw test options from run_suite:')
-    pp.pprint(args_dict)
-elif args:
-    logging.info('Raw test options from test_that:')
-    pp.pprint(args)
-    args_dict = utils.args_to_dict(args)
-else:
-    usage_error()
-
-gts_module = args_dict.get('module', gts_module)
-gts_revision = args_dict.get('revision', gts_revision)
-gts_test = args_dict.get('test', gts_test)
-gts_timeout = float(args_dict.get('timeout', gts_timeout))
-gts_retry = int(args_dict.get('max_retry', gts_retry))
-
-# Basic checks for option validity.
-logging.error('Running module %s with test %s on revision %s',
-              gts_module, gts_test, gts_revision)
-if not gts_module or not gts_test:
-    usage_error()
-
-# And we are getting ready for tradefed.
-uri = ('gs://chromeos-arc-images/cts/bundle/android-gts-' + gts_revision +
-       '.zip') if gts_revision else 'LATEST'
-run_template = ['run', 'commandAndExit', 'gts',
-                '--include-filter', gts_module + ' ' + gts_test,
-                '--skip-device-info',
-                '--ignore-business-logic-failure']
-retry_template = ['run', 'commandAndExit', 'retry',
-                  '--retry', '{session_id}']
-# Unfortunately super long test names can cause problems. Try to get the
-# rightmost element and use that as a simplified name.
-# TODO(ihf): fix pipeline so it works with super long names.
-simplified_test = gts_test
-if '#' in gts_test:
-    simplified_test = gts_test.split('#')[-1]
-elif '.' in gts_test:
-    simplified_test = gts_test.split('.')[-1]
-tag = 'tradefed-run-test.%s.%s' % (gts_module, simplified_test)
-
-# The usual testing stanza. We are suppressing some DEPENDENCIES on purpose.
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.tradefed-run-test'
-ATTRIBUTES = ''
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 0
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 256000
-DOC = ('Run a test of the Android Google Test Suite (GTS) in the ARC++ '
-       'container.')
-
-# And launch.
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=gts_retry,
-        needs_push_media=True,
-        tag=tag,
-        test_name=NAME,
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=run_template,
-        retry_template=retry_template,
-        target_module=None,
-        target_plan=None,
-        uri=uri,
-        load_waivers=('#' not in gts_test),  # No waivers for single-test runs
-        login_precondition_commands=[
-            'lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'
-        ],
-        precondition_commands=[
-            'echo $(({0} % 2 * 2 + 1)) > /proc/sys/kernel/perf_event_paranoid',
-            'modprobe configs'
-        ],
-        timeout=gts_timeout)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/generate_controlfiles.py b/server/site_tests/cheets_GTS/generate_controlfiles.py
deleted file mode 100755
index 1d3e413..0000000
--- a/server/site_tests/cheets_GTS/generate_controlfiles.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python2
-# Copyright 2019 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This is a trampoline script to invoke the actual generator script.
-
-import os
-import sys
-
-target_script_name = 'generate_controlfiles_GTS.py'
-target_script_path = os.path.abspath(os.path.join(os.path.dirname(__file__),
-    '..', '..', 'cros', 'tradefed', target_script_name))
-os.execv(target_script_path, sys.argv)
diff --git a/server/site_tests/cheets_GTS/notest_modules/notest_combined_modules.yaml b/server/site_tests/cheets_GTS/notest_modules/notest_combined_modules.yaml
deleted file mode 100644
index 0a6a27c..0000000
--- a/server/site_tests/cheets_GTS/notest_modules/notest_combined_modules.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-GtsIncident: [all]
-GtsIncrementalInstall: [all]
-GtsInstallerV2: [all]
-GtsMemory: [all]
-GtsSample: [all]
diff --git a/server/site_tests/cheets_GTS/notest_modules/notest_modules.yaml b/server/site_tests/cheets_GTS/notest_modules/notest_modules.yaml
deleted file mode 100644
index 828fd06..0000000
--- a/server/site_tests/cheets_GTS/notest_modules/notest_modules.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-GtsAccountsHostTestCases: [all]
-GtsAssistantHostTestCases: [all]
-GtsAssistantWorkProfileHostTestCases: [all]
-GtsAudioTestCases: [all]
-GtsBootHealthHostTestCases: [all]
-GtsContextHubPermissionDeviceTestCases: [all]
-GtsDebugfsMountTestCases: [all]
-GtsDeviceConfigTestCases: [all]
-GtsDevicePolicyTestCases: [all]
-GtsDexModuleRegistrationTestCases: [all]
-GtsDozeHostSideTestCases: [all]
-GtsFontHostTestCases: [all]
-GtsGameOverlayTestCases: [all]
-GtsGraphicsHostTestCases: [all]
-GtsIncidentConfirmationTestCases: [all]
-GtsIncidentManagerTestCases: [all]
-GtsIncrementalInstallProxyHostTestCases: [all]
-GtsIncrementalInstallTestCases: [all]
-GtsIncrementalInstallTestCases_BackgroundProcess: [all]
-GtsIncrementalInstallTriggerApp: [all]
-GtsIncrementalInstallTriggerApp_BackgroundProcess: [all]
-GtsInstallerV2TestCases: [all]
-GtsInstallerV2TestCases_BackgroundProcess: [all]
-GtsJniUncompressHostTestCases: [all]
-GtsJniUncompressTestCases: [all]
-GtsKidsHomeHostTestCases: [all]
-GtsLensTestCases: [all]
-GtsMemoryHostTestCases: [all]
-GtsMemoryTestCases: [all]
-GtsModuleMetadataTestCases: [all]
-GtsNetworkStackHostTestCases: [all]
-GtsOemLockServiceTestCases: [all]
-GtsPackageRoleEnforcementTests: [all]
-GtsPermissionControllerHostTestCases: [all]
-GtsPlayFsiHostTestCases: [all]
-GtsPlayFsiTestCases: [all]
-GtsRollbackManagerTest: [all]
-GtsSampleDeviceTestCases: [all]
-GtsSampleDynamicConfigTestCases: [all]
-GtsSampleHostTestCases: [all]
-GtsSetupWizardNoPermissionTestCases: [all]
-GtsSmartBatteryDeviceTestCases: [all]
-GtsSmsCallLogTestCases: [all]
-GtsSpeechServicesTestCases: [all]
-GtsStagedInstallHostTestCases: [all]
-GtsStorageTestCases: [all]
-GtsSupervisionTestCases: [all]
-GtsSuspendAppsTestCases: [all]
-GtsTelephonyNumberVerificationHostCases: [all]
-GtsTestHarnessModeTestCases: [all]
-GtsTvTestCases: [all]
-GtsUserspaceRebootHostSideTestCases: [all]
-GtsWellbeingHostTestCases: [all]
-GtsWellbeingTestCases: [all]
diff --git a/server/site_tests/cheets_GTS_R/OWNERS b/server/site_tests/cheets_GTS_R/OWNERS
deleted file mode 100644
index 3895a7b..0000000
--- a/server/site_tests/cheets_GTS_R/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-include /CTS_OWNERS
diff --git a/server/site_tests/cheets_GTS_R/cheets_GTS_R.py b/server/site_tests/cheets_GTS_R/cheets_GTS_R.py
deleted file mode 100644
index b6f35ce..0000000
--- a/server/site_tests/cheets_GTS_R/cheets_GTS_R.py
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# repohooks/pre-upload.py currently does not run pylint. But for developers who
-# want to check their code manually we disable several harmless pylint warnings
-# which just distract from more serious remaining issues.
-#
-# The instance variable _android_gts is not defined in __init__().
-# pylint: disable=attribute-defined-outside-init
-#
-# Many short variable names don't follow the naming convention.
-# pylint: disable=invalid-name
-
-import logging
-import os
-import shutil
-import tempfile
-
-from autotest_lib.server import utils
-from autotest_lib.server.cros.tradefed import tradefed_test
-
-# Maximum default time allowed for each individual GTS module.
-_GTS_TIMEOUT_SECONDS = 3600
-# TODO: fix it when we prepare the public control files.
-_PARTNER_GTS_BUCKET = 'gs://chromeos-partner-gts/'
-_PARTNER_GTS_LOCATION = _PARTNER_GTS_BUCKET + 'android-gts-9-R1-R-7679548.zip'
-_PARTNER_GTS_AUTHKEY = _PARTNER_GTS_BUCKET + 'gts-arc.json'
-_GTS_MEDIA_URI = ('https://storage.googleapis.com/youtube-test-media/gts/' +
-                  'GtsYouTubeTestCases-media-1.2.zip')
-_GTS_MEDIA_LOCALPATH = '/tmp/android-gts-media/GtsYouTubeTestCases'
-
-# Internal uprev for all GTS modules.
-_GTS_LATEST_URI = 'gs://chromeos-arc-images/cts/bundle/android-gts-9-R1-R-7679548.zip'
-
-
-class cheets_GTS_R(tradefed_test.TradefedTest):
-    """Sets up tradefed to run GTS tests."""
-    version = 1
-
-    _SHARD_CMD = '--shard-count'
-
-    def _tradefed_retry_command(self, template, session_id):
-        """Build tradefed 'retry' command from template."""
-        cmd = []
-        for arg in template:
-            cmd.append(arg.format(session_id=session_id))
-        return cmd
-
-    def _tradefed_run_command(self, template):
-        """Build tradefed 'run' command from template."""
-        cmd = template[:]
-        # If we are running outside of the lab we can collect more data.
-        if not utils.is_in_container():
-            logging.info('Running outside of lab, adding extra debug options.')
-            cmd.append('--log-level-display=DEBUG')
-
-        return cmd
-
-    def _get_default_bundle_url(self, bundle):
-        return _PARTNER_GTS_LOCATION
-
-    def _get_latest_bundle_url(self, bundle):
-        return _GTS_LATEST_URI
-
-    def _get_default_authkey(self):
-        return _PARTNER_GTS_AUTHKEY
-
-    def _get_tradefed_base_dir(self):
-        return 'android-gts'
-
-    def _tradefed_cmd_path(self):
-        return os.path.join(self._repository, 'tools', 'gts-tradefed')
-
-    def _tradefed_env(self):
-        if self._authkey:
-            return dict(os.environ, APE_API_KEY=self._authkey)
-        return None
-
-    def run_once(self,
-                 test_name,
-                 run_template,
-                 retry_template=None,
-                 target_module=None,
-                 target_plan=None,
-                 needs_push_media=False,
-                 enable_default_apps=False,
-                 executable_test_count=None,
-                 precondition_commands=[],
-                 login_precondition_commands=[],
-                 authkey=None,
-                 prerequisites=[],
-                 timeout=_GTS_TIMEOUT_SECONDS):
-        """Runs the specified GTS once, but with several retries.
-
-        Run an arbitrary tradefed command.
-
-        @param test_name: the name of test. Used for logging.
-        @param run_template: the template to construct the run command.
-                             Example: ['run', 'commandAndExit', 'cts',
-                                       '--skip-media-download']
-        @param retry_template: the template to construct the retry command.
-                               Example: ['run', 'commandAndExit', 'retry',
-                                         '--skip-media-download', '--retry',
-                                         '{session_id}']
-        @param target_module: the name of test module to run.
-        @param target_plan: the name of the test plan to run.
-        @param needs_push_media: need to push test media streams.
-        @param executable_test_count: the known number of tests in the run.
-        @param timeout: time after which tradefed can be interrupted.
-        @param precondition_commands: a list of scripts to be run on the
-        dut before the test is run, the scripts must already be installed.
-        @param login_precondition_commands: a list of scripts to be run on the
-        dut before the log-in for the test is performed.
-        @param prerequisites: a list of prerequisites that identify rogue DUTs.
-        """
-        # Download the GTS auth key to the local temp directory.
-        tmpdir = tempfile.mkdtemp()
-        try:
-            self._authkey = self._download_to_dir(
-                authkey or self._get_default_authkey(), tmpdir)
-
-            self._run_tradefed_with_retries(
-                    test_name=test_name,
-                    run_template=run_template,
-                    retry_template=retry_template,
-                    timeout=timeout,
-                    target_module=target_module,
-                    target_plan=target_plan,
-                    media_asset=tradefed_test.MediaAsset(
-                            _GTS_MEDIA_URI if needs_push_media else None,
-                            _GTS_MEDIA_LOCALPATH),
-                    enable_default_apps=enable_default_apps,
-                    executable_test_count=executable_test_count,
-                    login_precondition_commands=login_precondition_commands,
-                    precondition_commands=precondition_commands,
-                    prerequisites=prerequisites)
-        finally:
-            shutil.rmtree(tmpdir)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.CtsEdiHost b/server/site_tests/cheets_GTS_R/control.9.0_r1.CtsEdiHost
deleted file mode 100644
index 7f559f9..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.CtsEdiHost
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.CtsEdiHost'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module CtsEdiHostTestCases, CtsEdiHostTestCases[secondary_user] of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.CtsEdiHost',
-        test_name='cheets_GTS_R.9.0_r1.CtsEdiHost',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'CtsEdiHostTestCases', '--include-filter', 'CtsEdiHostTestCases[secondary_user]', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='CtsEdiHost',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAccountsHostTestCases
deleted file mode 100644
index 58518e6..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAccountsHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsAccountsHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAccountsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsAccountsHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsAccountsHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAccountsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAccountsHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAdminTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAdminTestCases
deleted file mode 100644
index 73f7dbb..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAdminTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsAdminTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAdminTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsAdminTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsAdminTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAdminTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAdminTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAfwTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAfwTestCases
deleted file mode 100644
index f525e8b..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAfwTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsAfwTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAfwTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsAfwTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsAfwTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAfwTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAfwTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAndroidAutoDeviceTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAndroidAutoDeviceTestCases
deleted file mode 100644
index 60eee71..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAndroidAutoDeviceTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsAndroidAutoDeviceTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAndroidAutoDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsAndroidAutoDeviceTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsAndroidAutoDeviceTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAndroidAutoDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAndroidAutoDeviceTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsApp b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsApp
deleted file mode 100644
index 4979a18..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsApp
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsApp'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAppBlacklistDeviceTestCases, GtsAppTestCases, GtsAppVisibilityDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsApp',
-        test_name='cheets_GTS_R.9.0_r1.GtsApp',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsAppBlacklistDeviceTestCases', '--include-filter', 'GtsAppTestCases', '--include-filter', 'GtsAppVisibilityDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsApp',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1440)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsArtManagerHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsArtManagerHostTestCases
deleted file mode 100644
index 7f2caf5..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsArtManagerHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsArtManagerHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsArtManagerHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsArtManagerHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsArtManagerHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsArtManagerHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsArtManagerHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAssistIntentTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAssistIntentTestCases
deleted file mode 100644
index 30ac41f..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAssistIntentTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsAssistIntentTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAssistIntentTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsAssistIntentTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsAssistIntentTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAssistIntentTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAssistIntentTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAssistant b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAssistant
deleted file mode 100644
index 90d0b46..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAssistant
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsAssistant'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAssistantHostTestCases, GtsAssistantMicHostTestCases, GtsAssistantWorkProfileHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsAssistant',
-        test_name='cheets_GTS_R.9.0_r1.GtsAssistant',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsAssistantHostTestCases', '--include-filter', 'GtsAssistantMicHostTestCases', '--include-filter', 'GtsAssistantWorkProfileHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAssistant',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1440)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAudioTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAudioTestCases
deleted file mode 100644
index 91cb364..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAudioTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsAudioTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAudioTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsAudioTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsAudioTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAudioTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAudioTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsBackup b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsBackup
deleted file mode 100644
index f411ba0..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsBackup
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsBackup'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsBackupHostTestCases, GtsBackupTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsBackup',
-        test_name='cheets_GTS_R.9.0_r1.GtsBackup',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsBackupHostTestCases', '--include-filter', 'GtsBackupTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsBackup',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=2520)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsBoot b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsBoot
deleted file mode 100644
index e1c0994..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsBoot
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsBoot'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsBootHealthHostTestCases, GtsBootStatsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsBoot',
-        test_name='cheets_GTS_R.9.0_r1.GtsBoot',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsBootHealthHostTestCases', '--include-filter', 'GtsBootStatsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsBoot',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCNGCoreTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCNGCoreTestCases
deleted file mode 100644
index 57a79ca..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCNGCoreTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsCNGCoreTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCNGCoreTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsCNGCoreTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsCNGCoreTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCNGCoreTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCNGCoreTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCalendarTests b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCalendarTests
deleted file mode 100644
index f4ba7fd..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCalendarTests
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsCalendarTests'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCalendarTests of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsCalendarTests',
-        test_name='cheets_GTS_R.9.0_r1.GtsCalendarTests',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCalendarTests', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCalendarTests',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCallLogTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCallLogTestCases
deleted file mode 100644
index e38efc5..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCallLogTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsCallLogTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCallLogTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsCallLogTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsCallLogTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCallLogTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCallLogTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCameraTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCameraTestCases
deleted file mode 100644
index 4048da9..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCameraTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsCameraTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCameraTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsCameraTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsCameraTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCameraTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCameraTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCastHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCastHostTestCases
deleted file mode 100644
index e2c7062..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCastHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsCastHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCastHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsCastHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsCastHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCastHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCastHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContacts b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContacts
deleted file mode 100644
index de25865..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContacts
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsContacts'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContactsAppDeviceTestCases, GtsContactsTest of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsContacts',
-        test_name='cheets_GTS_R.9.0_r1.GtsContacts',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsContactsAppDeviceTestCases', '--include-filter', 'GtsContactsTest', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContacts',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContent b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContent
deleted file mode 100644
index bff22d6..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContent
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsContent'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContentHostTestCases, GtsContentTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsContent',
-        test_name='cheets_GTS_R.9.0_r1.GtsContent',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsContentHostTestCases', '--include-filter', 'GtsContentTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContent',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContextHubPermissionDeviceTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContextHubPermissionDeviceTestCases
deleted file mode 100644
index b7dc2b6..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContextHubPermissionDeviceTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsContextHubPermissionDeviceTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContextHubPermissionDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsContextHubPermissionDeviceTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsContextHubPermissionDeviceTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContextHubPermissionDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContextHubPermissionDeviceTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDebugfsMountTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDebugfsMountTestCases
deleted file mode 100644
index 13ad947..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDebugfsMountTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsDebugfsMountTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDebugfsMountTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsDebugfsMountTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsDebugfsMountTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDebugfsMountTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDebugfsMountTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDevice b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDevice
deleted file mode 100644
index 18c962d..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDevice
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsDevice'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDeviceConfigTestCases, GtsDevicePolicyHostTestCases, GtsDevicePolicyTestCases, GtsDevicePolicyTestCases[secondary_user] of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsDevice',
-        test_name='cheets_GTS_R.9.0_r1.GtsDevice',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsDeviceConfigTestCases', '--include-filter', 'GtsDevicePolicyHostTestCases', '--include-filter', 'GtsDevicePolicyTestCases', '--include-filter', 'GtsDevicePolicyTestCases[secondary_user]', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDevice',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1800)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDexModuleRegistrationTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDexModuleRegistrationTestCases
deleted file mode 100644
index 3eedda0..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDexModuleRegistrationTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsDexModuleRegistrationTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDexModuleRegistrationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsDexModuleRegistrationTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsDexModuleRegistrationTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDexModuleRegistrationTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDexModuleRegistrationTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDialer b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDialer
deleted file mode 100644
index bc7a272..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDialer
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsDialer'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDialerAudioTestCases, GtsDialerDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsDialer',
-        test_name='cheets_GTS_R.9.0_r1.GtsDialer',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsDialerAudioTestCases', '--include-filter', 'GtsDialerDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDialer',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDoze b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDoze
deleted file mode 100644
index 0da3df1..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDoze
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsDoze'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDozeDeviceTestCases, GtsDozeHostSideTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsDoze',
-        test_name='cheets_GTS_R.9.0_r1.GtsDoze',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsDozeDeviceTestCases', '--include-filter', 'GtsDozeHostSideTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDoze',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDuoReadyTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDuoReadyTestCases
deleted file mode 100644
index 65af6da..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDuoReadyTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsDuoReadyTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDuoReadyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsDuoReadyTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsDuoReadyTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDuoReadyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDuoReadyTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsEdiHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsEdiHostTestCases
deleted file mode 100644
index b773748..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsEdiHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsEdiHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsEdiHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsEdiHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsEdiHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsEdiHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsEdiHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsExoPlayerTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsExoPlayerTestCases
deleted file mode 100644
index 8eccc7f..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsExoPlayerTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsExoPlayerTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsExoPlayerTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsExoPlayerTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsExoPlayerTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsExoPlayerTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsExoPlayerTestCases',
-        target_plan=None,
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=5400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFeaturesTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFeaturesTestCases
deleted file mode 100644
index cfcc5fb..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFeaturesTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsFeaturesTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsFeaturesTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsFeaturesTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsFeaturesTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFeaturesTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsFeaturesTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFilesByGoogleTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFilesByGoogleTestCases
deleted file mode 100644
index a67bb7e..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFilesByGoogleTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsFilesByGoogleTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsFilesByGoogleTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsFilesByGoogleTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsFilesByGoogleTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFilesByGoogleTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsFilesByGoogleTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFontHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFontHostTestCases
deleted file mode 100644
index 907dd16..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFontHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsFontHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsFontHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsFontHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsFontHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFontHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsFontHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGameOverlayTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGameOverlayTestCases
deleted file mode 100644
index acf21c8..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGameOverlayTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsGameOverlayTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameOverlayTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsGameOverlayTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsGameOverlayTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameOverlayTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameOverlayTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGmscoreHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGmscoreHostTestCases
deleted file mode 100644
index 44bf44e..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGmscoreHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsGmscoreHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGmscoreHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsGmscoreHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsGmscoreHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGmscoreHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGmscoreHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        prerequisites=['bluetooth'],
-        use_jdk9=True,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGraphicsHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGraphicsHostTestCases
deleted file mode 100644
index e78139d..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGraphicsHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsGraphicsHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGraphicsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsGraphicsHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsGraphicsHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGraphicsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGraphicsHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsHomeHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsHomeHostTestCases
deleted file mode 100644
index 85bd332..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsHomeHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsHomeHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsHomeHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsHomeHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsHomeHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsHomeHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsHomeHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsIncident b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsIncident
deleted file mode 100644
index b3665da..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsIncident
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsIncident'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncidentConfirmationTestCases, GtsIncidentManagerTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsIncident',
-        test_name='cheets_GTS_R.9.0_r1.GtsIncident',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsIncidentConfirmationTestCases', '--include-filter', 'GtsIncidentManagerTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncident',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsIncrementalInstall b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsIncrementalInstall
deleted file mode 100644
index 3503249..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsIncrementalInstall
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsIncrementalInstall'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncrementalInstallProxyHostTestCases, GtsIncrementalInstallTestCases, GtsIncrementalInstallTestCases_BackgroundProcess of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsIncrementalInstall',
-        test_name='cheets_GTS_R.9.0_r1.GtsIncrementalInstall',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsIncrementalInstallProxyHostTestCases', '--include-filter', 'GtsIncrementalInstallTestCases', '--include-filter', 'GtsIncrementalInstallTestCases_BackgroundProcess', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncrementalInstall',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1440)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases
deleted file mode 100644
index f842fd3..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsInstallPackagesWhitelistDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallPackagesWhitelistDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallPackagesWhitelistDeviceTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsInstantAppsHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsInstantAppsHostTestCases
deleted file mode 100644
index 5bbc1e0..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsInstantAppsHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsInstantAppsHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsInstantAppsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsInstantAppsHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsInstantAppsHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstantAppsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstantAppsHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsJniUncompressHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsJniUncompressHostTestCases
deleted file mode 100644
index cf172e2..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsJniUncompressHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsJniUncompressHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsJniUncompressHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsJniUncompressHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsJniUncompressHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsJniUncompressHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsJniUncompressHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsKidsHomeHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsKidsHomeHostTestCases
deleted file mode 100644
index b5f06a1..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsKidsHomeHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsKidsHomeHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsKidsHomeHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsKidsHomeHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsKidsHomeHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsKidsHomeHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsKidsHomeHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLargeApkHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLargeApkHostTestCases
deleted file mode 100644
index 3dce721..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLargeApkHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsLargeApkHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLargeApkHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsLargeApkHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsLargeApkHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLargeApkHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLargeApkHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLensTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLensTestCases
deleted file mode 100644
index b6f8c68..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLensTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsLensTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLensTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsLensTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsLensTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLensTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLensTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLinkerConfig b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLinkerConfig
deleted file mode 100644
index 5336993..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLinkerConfig
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsLinkerConfig'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLinkerConfigTestCases, GtsLinkerConfigTestCases[secondary_user] of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsLinkerConfig',
-        test_name='cheets_GTS_R.9.0_r1.GtsLinkerConfig',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsLinkerConfigTestCases', '--include-filter', 'GtsLinkerConfigTestCases[secondary_user]', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLinkerConfig',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLocation b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLocation
deleted file mode 100644
index 68d53ec..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLocation
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsLocation'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLocationHostTestCases, GtsLocationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsLocation',
-        test_name='cheets_GTS_R.9.0_r1.GtsLocation',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsLocationHostTestCases', '--include-filter', 'GtsLocationTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLocation',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMbaPrivilegedPermissionTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMbaPrivilegedPermissionTestCases
deleted file mode 100644
index fe156d7..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMbaPrivilegedPermissionTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsMbaPrivilegedPermissionTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMbaPrivilegedPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsMbaPrivilegedPermissionTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsMbaPrivilegedPermissionTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMbaPrivilegedPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMbaPrivilegedPermissionTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMemory b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMemory
deleted file mode 100644
index 837fb92..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMemory
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsMemory'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMemoryHostTestCases, GtsMemoryTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsMemory',
-        test_name='cheets_GTS_R.9.0_r1.GtsMemory',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsMemoryHostTestCases', '--include-filter', 'GtsMemoryTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMemory',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsModuleMetadataTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsModuleMetadataTestCases
deleted file mode 100644
index 9a6fa05..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsModuleMetadataTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsModuleMetadataTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsModuleMetadataTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsModuleMetadataTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsModuleMetadataTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsModuleMetadataTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsModuleMetadataTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNet b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNet
deleted file mode 100644
index 50bb3fd..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNet
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsNet'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNetStatsHostTestCases, GtsNetTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsNet',
-        test_name='cheets_GTS_R.9.0_r1.GtsNet',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsNetStatsHostTestCases', '--include-filter', 'GtsNetTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNet',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNetwork b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNetwork
deleted file mode 100644
index 39be836..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNetwork
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsNetwork'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNetworkStackHostTestCases, GtsNetworkWatchlistTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsNetwork',
-        test_name='cheets_GTS_R.9.0_r1.GtsNetwork',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsNetworkStackHostTestCases', '--include-filter', 'GtsNetworkWatchlistTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNetwork',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNmgiarcTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNmgiarcTestCases
deleted file mode 100644
index 3031df3..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNmgiarcTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsNmgiarcTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNmgiarcTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsNmgiarcTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsNmgiarcTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNmgiarcTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNmgiarcTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNoPermission b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNoPermission
deleted file mode 100644
index bdf049b..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNoPermission
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsNoPermission'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNoPermissionTestCases, GtsNoPermissionTestCases25 of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsNoPermission',
-        test_name='cheets_GTS_R.9.0_r1.GtsNoPermission',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsNoPermissionTestCases', '--include-filter', 'GtsNoPermissionTestCases25', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNoPermission',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNotificationTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNotificationTestCases
deleted file mode 100644
index 34efeb5..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNotificationTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsNotificationTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNotificationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsNotificationTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsNotificationTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNotificationTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNotificationTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsOemLockServiceTestCases
deleted file mode 100644
index 8a4f0e4..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsOemLockServiceTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsOemLockServiceTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsOemLockServiceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsOemLockServiceTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsOemLockServiceTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsOemLockServiceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsOemLockServiceTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsOsTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsOsTestCases
deleted file mode 100644
index 8fae83f..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsOsTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsOsTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsOsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsOsTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsOsTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsOsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsOsTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPackage b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPackage
deleted file mode 100644
index 461c872..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPackage
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsPackage'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageInstallTestCases, GtsPackageInstallerTapjackingTestCases, GtsPackageManagerHostTestCases, GtsPackageNameCertPairsDeviceTestCases, GtsPackageRoleEnforcementTests, GtsPackageUninstallTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsPackage',
-        test_name='cheets_GTS_R.9.0_r1.GtsPackage',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsPackageInstallTestCases', '--include-filter', 'GtsPackageInstallerTapjackingTestCases', '--include-filter', 'GtsPackageManagerHostTestCases', '--include-filter', 'GtsPackageNameCertPairsDeviceTestCases', '--include-filter', 'GtsPackageRoleEnforcementTests', '--include-filter', 'GtsPackageUninstallTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPackage',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=2520)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPartnerBookmarksTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPartnerBookmarksTestCases
deleted file mode 100644
index eadea23..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPartnerBookmarksTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsPartnerBookmarksTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPartnerBookmarksTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsPartnerBookmarksTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsPartnerBookmarksTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPartnerBookmarksTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPartnerBookmarksTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPermission b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPermission
deleted file mode 100644
index 8117b3c..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPermission
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsPermission'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPermissionControllerHostTestCases, GtsPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsPermission',
-        test_name='cheets_GTS_R.9.0_r1.GtsPermission',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsPermissionControllerHostTestCases', '--include-filter', 'GtsPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPermission',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPlacementTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPlacementTestCases
deleted file mode 100644
index a7e5360..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPlacementTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsPlacementTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPlacementTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsPlacementTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsPlacementTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlacementTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPlacementTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPlay b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPlay
deleted file mode 100644
index d2e6c7c..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPlay
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsPlay'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPlayAutoInstallTestCases, GtsPlayFsiHostTestCases, GtsPlayFsiTestCases, GtsPlayStoreHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsPlay',
-        test_name='cheets_GTS_R.9.0_r1.GtsPlay',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsPlayAutoInstallTestCases', '--include-filter', 'GtsPlayFsiHostTestCases', '--include-filter', 'GtsPlayFsiTestCases', '--include-filter', 'GtsPlayStoreHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPlay',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1800)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPrintTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPrintTestCases
deleted file mode 100644
index b45ddae..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPrintTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsPrintTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPrintTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsPrintTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsPrintTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrintTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPrintTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPrivacyTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPrivacyTestCases
deleted file mode 100644
index 8714e2e..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPrivacyTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsPrivacyTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPrivacyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsPrivacyTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsPrivacyTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrivacyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPrivacyTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPropertiesTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPropertiesTestCases
deleted file mode 100644
index 043ed92..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPropertiesTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsPropertiesTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPropertiesTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsPropertiesTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsPropertiesTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPropertiesTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPropertiesTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRegulationComplianceTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRegulationComplianceTestCases
deleted file mode 100644
index 1134b8e..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRegulationComplianceTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsRegulationComplianceTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsRegulationComplianceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsRegulationComplianceTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsRegulationComplianceTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRegulationComplianceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsRegulationComplianceTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRlzTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRlzTestCases
deleted file mode 100644
index 43c4c1e..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRlzTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsRlzTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsRlzTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsRlzTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsRlzTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRlzTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsRlzTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRollbackManagerTest b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRollbackManagerTest
deleted file mode 100644
index 4f74008..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRollbackManagerTest
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsRollbackManagerTest'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsRollbackManagerTest of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsRollbackManagerTest',
-        test_name='cheets_GTS_R.9.0_r1.GtsRollbackManagerTest',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRollbackManagerTest', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsRollbackManagerTest',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSample b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSample
deleted file mode 100644
index 95d9fcd..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSample
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsSample'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSampleDeviceTestCases, GtsSampleDynamicConfigTestCases, GtsSampleHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSample',
-        test_name='cheets_GTS_R.9.0_r1.GtsSample',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSampleDeviceTestCases', '--include-filter', 'GtsSampleDynamicConfigTestCases', '--include-filter', 'GtsSampleHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSample',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1440)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsScreenshotHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsScreenshotHostTestCases
deleted file mode 100644
index add5e17..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsScreenshotHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsScreenshotHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsScreenshotHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsScreenshotHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsScreenshotHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsScreenshotHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsScreenshotHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSearchHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSearchHostTestCases
deleted file mode 100644
index 6d3bdf2..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSearchHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsSearchHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSearchHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSearchHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsSearchHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSearchHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSearchHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSecurityHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSecurityHostTestCases
deleted file mode 100644
index 4299334..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSecurityHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsSecurityHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSecurityHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSecurityHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsSecurityHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSecurityHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSecurityHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSensorHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSensorHostTestCases
deleted file mode 100644
index e9117b4..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSensorHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsSensorHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSensorHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSensorHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsSensorHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSensorHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSensorHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSettings b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSettings
deleted file mode 100644
index 0f0f4c8..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSettings
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsSettings'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSettingsHostTestCases, GtsSettingsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSettings',
-        test_name='cheets_GTS_R.9.0_r1.GtsSettings',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSettingsHostTestCases', '--include-filter', 'GtsSettingsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSettings',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSetupWizard b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSetupWizard
deleted file mode 100644
index 6d38b91..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSetupWizard
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsSetupWizard'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSetupWizardHostTestCases, GtsSetupWizardNoPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSetupWizard',
-        test_name='cheets_GTS_R.9.0_r1.GtsSetupWizard',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSetupWizardHostTestCases', '--include-filter', 'GtsSetupWizardNoPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSetupWizard',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSimAppDialogTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSimAppDialogTestCases
deleted file mode 100644
index e1232a9..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSimAppDialogTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsSimAppDialogTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSimAppDialogTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSimAppDialogTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsSimAppDialogTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSimAppDialogTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSimAppDialogTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSmartBatteryDeviceTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSmartBatteryDeviceTestCases
deleted file mode 100644
index 955c5e2..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSmartBatteryDeviceTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsSmartBatteryDeviceTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSmartBatteryDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSmartBatteryDeviceTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsSmartBatteryDeviceTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSmartBatteryDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSmartBatteryDeviceTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSmsCallLogTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSmsCallLogTestCases
deleted file mode 100644
index 0525b96..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSmsCallLogTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsSmsCallLogTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSmsCallLogTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSmsCallLogTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsSmsCallLogTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSmsCallLogTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSmsCallLogTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSpeechServicesTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSpeechServicesTestCases
deleted file mode 100644
index 296ae4a..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSpeechServicesTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsSpeechServicesTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSpeechServicesTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSpeechServicesTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsSpeechServicesTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSpeechServicesTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSpeechServicesTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSsaidHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSsaidHostTestCases
deleted file mode 100644
index 252889d..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSsaidHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsSsaidHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSsaidHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSsaidHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsSsaidHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSsaidHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSsaidHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStagedInstallHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStagedInstallHostTestCases
deleted file mode 100644
index 2fa659d..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStagedInstallHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsStagedInstallHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsStagedInstallHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsStagedInstallHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsStagedInstallHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStagedInstallHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsStagedInstallHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStatsdHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStatsdHostTestCases
deleted file mode 100644
index 3f8fbf5..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStatsdHostTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsStatsdHostTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsStatsdHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsStatsdHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsStatsdHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStatsdHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsStatsdHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStorageTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStorageTestCases
deleted file mode 100644
index 518bfaa..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStorageTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsStorageTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsStorageTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsStorageTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsStorageTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStorageTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsStorageTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSupervisionTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSupervisionTestCases
deleted file mode 100644
index 61d9ea0..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSupervisionTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsSupervisionTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSupervisionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSupervisionTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsSupervisionTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSupervisionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSupervisionTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSuspendApps b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSuspendApps
deleted file mode 100644
index f82e407..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSuspendApps
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsSuspendApps'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSuspendAppsPermissionTestCases, GtsSuspendAppsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsSuspendApps',
-        test_name='cheets_GTS_R.9.0_r1.GtsSuspendApps',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSuspendAppsPermissionTestCases', '--include-filter', 'GtsSuspendAppsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSuspendApps',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTelecomManagerTests b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTelecomManagerTests
deleted file mode 100644
index 65f5c74..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTelecomManagerTests
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsTelecomManagerTests'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTelecomManagerTests of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsTelecomManagerTests',
-        test_name='cheets_GTS_R.9.0_r1.GtsTelecomManagerTests',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTelecomManagerTests', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTelecomManagerTests',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTelephony b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTelephony
deleted file mode 100644
index 135ed89..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTelephony
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsTelephony'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTelephonyNumberVerificationHostCases, GtsTelephonyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsTelephony',
-        test_name='cheets_GTS_R.9.0_r1.GtsTelephony',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsTelephonyNumberVerificationHostCases', '--include-filter', 'GtsTelephonyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTelephony',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTestHarnessModeTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTestHarnessModeTestCases
deleted file mode 100644
index f29c11a..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTestHarnessModeTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsTestHarnessModeTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTestHarnessModeTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsTestHarnessModeTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsTestHarnessModeTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTestHarnessModeTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTestHarnessModeTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTetheringTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTetheringTestCases
deleted file mode 100644
index 73de1a2..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTetheringTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsTetheringTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTetheringTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsTetheringTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsTetheringTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTetheringTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTetheringTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTv b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTv
deleted file mode 100644
index 067081e..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTv
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsTv'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTvBugReportTestCases, GtsTvHostTestCases, GtsTvTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsTv',
-        test_name='cheets_GTS_R.9.0_r1.GtsTv',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsTvBugReportTestCases', '--include-filter', 'GtsTvHostTestCases', '--include-filter', 'GtsTvTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTv',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1440)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUnofficialApisUsageTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUnofficialApisUsageTestCases
deleted file mode 100644
index ab36e5d..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUnofficialApisUsageTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsUnofficialApisUsageTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsUnofficialApisUsageTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsUnofficialApisUsageTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsUnofficialApisUsageTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUnofficialApisUsageTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsUnofficialApisUsageTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUsageStatsTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUsageStatsTestCases
deleted file mode 100644
index 536407a..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUsageStatsTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsUsageStatsTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsUsageStatsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsUsageStatsTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsUsageStatsTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUsageStatsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsUsageStatsTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUserspaceRebootHostSideTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUserspaceRebootHostSideTestCases
deleted file mode 100644
index abd543d..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUserspaceRebootHostSideTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsUserspaceRebootHostSideTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsUserspaceRebootHostSideTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsUserspaceRebootHostSideTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsUserspaceRebootHostSideTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUserspaceRebootHostSideTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsUserspaceRebootHostSideTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsViewTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsViewTestCases
deleted file mode 100644
index 73972d0..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsViewTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsViewTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsViewTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsViewTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsViewTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsViewTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsViewTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsVndkDependencyTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsVndkDependencyTestCases
deleted file mode 100644
index d0e95f6..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsVndkDependencyTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsVndkDependencyTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsVndkDependencyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsVndkDependencyTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsVndkDependencyTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsVndkDependencyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsVndkDependencyTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsWebView b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsWebView
deleted file mode 100644
index 6c211c8..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsWebView
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsWebView'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsWebViewHostTestCases, GtsWebViewTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsWebView',
-        test_name='cheets_GTS_R.9.0_r1.GtsWebView',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsWebViewHostTestCases', '--include-filter', 'GtsWebViewTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsWebView',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsWellbeing b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsWellbeing
deleted file mode 100644
index 4967d86..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsWellbeing
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsWellbeing'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsWellbeingHostTestCases, GtsWellbeingPermissionPolicyTestCases, GtsWellbeingTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.GtsWellbeing',
-        test_name='cheets_GTS_R.9.0_r1.GtsWellbeing',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsWellbeingHostTestCases', '--include-filter', 'GtsWellbeingPermissionPolicyTestCases', '--include-filter', 'GtsWellbeingTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsWellbeing',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1440)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsYouTubeTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsYouTubeTestCases
deleted file mode 100644
index bcf953d..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsYouTubeTestCases
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.GtsYouTubeTestCases'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsYouTubeTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        needs_push_media=True,
-        tag='9.0_r1.GtsYouTubeTestCases',
-        test_name='cheets_GTS_R.9.0_r1.GtsYouTubeTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsYouTubeTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsYouTubeTestCases',
-        target_plan=None,
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases
deleted file mode 100644
index 008844c..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases'
-ATTRIBUTES = 'suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module CtsEdiHostTestCases, CtsEdiHostTestCases[secondary_user], GtsAccountsHostTestCases, GtsAdminTestCases, GtsAfwTestCases, GtsAndroidAutoDeviceTestCases, GtsAppBlacklistDeviceTestCases, GtsAppTestCases, GtsAppVisibilityDeviceTestCases, GtsArtManagerHostTestCases, GtsAssistIntentTestCases, GtsAssistantHostTestCases, GtsAssistantMicHostTestCases, GtsAssistantWorkProfileHostTestCases, GtsAudioTestCases, GtsBackupHostTestCases, GtsBackupTestCases, GtsBootHealthHostTestCases, GtsBootStatsTestCases, GtsCNGCoreTestCases, GtsCalendarTests, GtsCallLogTestCases, GtsCameraTestCases, GtsCastHostTestCases, GtsContactsAppDeviceTestCases, GtsContactsTest, GtsContentHostTestCases, GtsContentTestCases, GtsContextHubPermissionDeviceTestCases, GtsDebugfsMountTestCases, GtsDeviceConfigTestCases, GtsDevicePolicyHostTestCases, GtsDevicePolicyTestCases, GtsDevicePolicyTestCases[secondary_user], GtsDexModuleRegistrationTestCases, GtsDialerAudioTestCases, GtsDialerDeviceTestCases, GtsDozeDeviceTestCases, GtsDozeHostSideTestCases, GtsDuoReadyTestCases, GtsEdiHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases',
-        test_name='cheets_GTS_R.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'CtsEdiHostTestCases', '--include-filter', 'CtsEdiHostTestCases[secondary_user]', '--include-filter', 'GtsAccountsHostTestCases', '--include-filter', 'GtsAdminTestCases', '--include-filter', 'GtsAfwTestCases', '--include-filter', 'GtsAndroidAutoDeviceTestCases', '--include-filter', 'GtsAppBlacklistDeviceTestCases', '--include-filter', 'GtsAppTestCases', '--include-filter', 'GtsAppVisibilityDeviceTestCases', '--include-filter', 'GtsArtManagerHostTestCases', '--include-filter', 'GtsAssistIntentTestCases', '--include-filter', 'GtsAssistantHostTestCases', '--include-filter', 'GtsAssistantMicHostTestCases', '--include-filter', 'GtsAssistantWorkProfileHostTestCases', '--include-filter', 'GtsAudioTestCases', '--include-filter', 'GtsBackupHostTestCases', '--include-filter', 'GtsBackupTestCases', '--include-filter', 'GtsBootHealthHostTestCases', '--include-filter', 'GtsBootStatsTestCases', '--include-filter', 'GtsCNGCoreTestCases', '--include-filter', 'GtsCalendarTests', '--include-filter', 'GtsCallLogTestCases', '--include-filter', 'GtsCameraTestCases', '--include-filter', 'GtsCastHostTestCases', '--include-filter', 'GtsContactsAppDeviceTestCases', '--include-filter', 'GtsContactsTest', '--include-filter', 'GtsContentHostTestCases', '--include-filter', 'GtsContentTestCases', '--include-filter', 'GtsContextHubPermissionDeviceTestCases', '--include-filter', 'GtsDebugfsMountTestCases', '--include-filter', 'GtsDeviceConfigTestCases', '--include-filter', 'GtsDevicePolicyHostTestCases', '--include-filter', 'GtsDevicePolicyTestCases', '--include-filter', 'GtsDevicePolicyTestCases[secondary_user]', '--include-filter', 'GtsDexModuleRegistrationTestCases', '--include-filter', 'GtsDialerAudioTestCases', '--include-filter', 'GtsDialerDeviceTestCases', '--include-filter', 'GtsDozeDeviceTestCases', '--include-filter', 'GtsDozeHostSideTestCases', '--include-filter', 'GtsDuoReadyTestCases', '--include-filter', 'GtsEdiHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='all.CtsEdiHostTestCases_-_GtsEdiHostTestCases',
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases
deleted file mode 100644
index 2ac88a4..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases'
-ATTRIBUTES = 'suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsExoPlayerTestCases, GtsFeaturesTestCases, GtsFilesByGoogleTestCases, GtsFontHostTestCases, GtsGameOverlayTestCases, GtsGmscoreHostTestCases, GtsGraphicsHostTestCases, GtsHomeHostTestCases, GtsIncidentConfirmationTestCases, GtsIncidentManagerTestCases, GtsIncrementalInstallProxyHostTestCases, GtsIncrementalInstallTestCases, GtsIncrementalInstallTestCases_BackgroundProcess, GtsInstallPackagesWhitelistDeviceTestCases, GtsInstantAppsHostTestCases, GtsJniUncompressHostTestCases, GtsKidsHomeHostTestCases, GtsLargeApkHostTestCases, GtsLensTestCases, GtsLinkerConfigTestCases, GtsLinkerConfigTestCases[secondary_user], GtsLocationHostTestCases, GtsLocationTestCases, GtsMbaPrivilegedPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='9.0_r1.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases',
-        test_name='cheets_GTS_R.9.0_r1.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsExoPlayerTestCases', '--include-filter', 'GtsFeaturesTestCases', '--include-filter', 'GtsFilesByGoogleTestCases', '--include-filter', 'GtsFontHostTestCases', '--include-filter', 'GtsGameOverlayTestCases', '--include-filter', 'GtsGmscoreHostTestCases', '--include-filter', 'GtsGraphicsHostTestCases', '--include-filter', 'GtsHomeHostTestCases', '--include-filter', 'GtsIncidentConfirmationTestCases', '--include-filter', 'GtsIncidentManagerTestCases', '--include-filter', 'GtsIncrementalInstallProxyHostTestCases', '--include-filter', 'GtsIncrementalInstallTestCases', '--include-filter', 'GtsIncrementalInstallTestCases_BackgroundProcess', '--include-filter', 'GtsInstallPackagesWhitelistDeviceTestCases', '--include-filter', 'GtsInstantAppsHostTestCases', '--include-filter', 'GtsJniUncompressHostTestCases', '--include-filter', 'GtsKidsHomeHostTestCases', '--include-filter', 'GtsLargeApkHostTestCases', '--include-filter', 'GtsLensTestCases', '--include-filter', 'GtsLinkerConfigTestCases', '--include-filter', 'GtsLinkerConfigTestCases[secondary_user]', '--include-filter', 'GtsLocationHostTestCases', '--include-filter', 'GtsLocationTestCases', '--include-filter', 'GtsMbaPrivilegedPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases',
-        target_plan=None,
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        prerequisites=['bluetooth'],
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases
deleted file mode 100644
index 9b5f457..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases'
-ATTRIBUTES = 'suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMemoryHostTestCases, GtsMemoryTestCases, GtsModuleMetadataTestCases, GtsNetStatsHostTestCases, GtsNetTestCases, GtsNetworkStackHostTestCases, GtsNetworkWatchlistTestCases, GtsNmgiarcTestCases, GtsNoPermissionTestCases, GtsNoPermissionTestCases25, GtsNotificationTestCases, GtsOemLockServiceTestCases, GtsOsTestCases, GtsPackageInstallTestCases, GtsPackageInstallerTapjackingTestCases, GtsPackageManagerHostTestCases, GtsPackageNameCertPairsDeviceTestCases, GtsPackageRoleEnforcementTests, GtsPackageUninstallTestCases, GtsPartnerBookmarksTestCases, GtsPermissionControllerHostTestCases, GtsPermissionTestCases, GtsPlacementTestCases, GtsPlayAutoInstallTestCases, GtsPlayFsiHostTestCases, GtsPlayFsiTestCases, GtsPlayStoreHostTestCases, GtsPrintTestCases, GtsPrivacyTestCases, GtsPropertiesTestCases, GtsRegulationComplianceTestCases, GtsRlzTestCases, GtsRollbackManagerTest, GtsSampleDeviceTestCases, GtsSampleDynamicConfigTestCases, GtsSampleHostTestCases, GtsScreenshotHostTestCases, GtsSearchHostTestCases, GtsSecurityHostTestCases, GtsSensorHostTestCases, GtsSettingsHostTestCases, GtsSettingsTestCases, GtsSetupWizardHostTestCases, GtsSetupWizardNoPermissionTestCases, GtsSimAppDialogTestCases, GtsSmartBatteryDeviceTestCases, GtsSmsCallLogTestCases, GtsSpeechServicesTestCases, GtsSsaidHostTestCases, GtsStagedInstallHostTestCases, GtsStatsdHostTestCases, GtsStorageTestCases, GtsSupervisionTestCases, GtsSuspendAppsPermissionTestCases, GtsSuspendAppsTestCases, GtsTelecomManagerTests, GtsTelephonyNumberVerificationHostCases, GtsTelephonyTestCases, GtsTestHarnessModeTestCases, GtsTetheringTestCases, GtsTvBugReportTestCases, GtsTvHostTestCases, GtsTvTestCases, GtsUnofficialApisUsageTestCases, GtsUsageStatsTestCases, GtsUserspaceRebootHostSideTestCases, GtsViewTestCases, GtsVndkDependencyTestCases, GtsWebViewHostTestCases, GtsWebViewTestCases, GtsWellbeingHostTestCases, GtsWellbeingPermissionPolicyTestCases, GtsWellbeingTestCases, GtsYouTubeTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        needs_push_media=True,
-        tag='9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases',
-        test_name='cheets_GTS_R.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsMemoryHostTestCases', '--include-filter', 'GtsMemoryTestCases', '--include-filter', 'GtsModuleMetadataTestCases', '--include-filter', 'GtsNetStatsHostTestCases', '--include-filter', 'GtsNetTestCases', '--include-filter', 'GtsNetworkStackHostTestCases', '--include-filter', 'GtsNetworkWatchlistTestCases', '--include-filter', 'GtsNmgiarcTestCases', '--include-filter', 'GtsNoPermissionTestCases', '--include-filter', 'GtsNoPermissionTestCases25', '--include-filter', 'GtsNotificationTestCases', '--include-filter', 'GtsOemLockServiceTestCases', '--include-filter', 'GtsOsTestCases', '--include-filter', 'GtsPackageInstallTestCases', '--include-filter', 'GtsPackageInstallerTapjackingTestCases', '--include-filter', 'GtsPackageManagerHostTestCases', '--include-filter', 'GtsPackageNameCertPairsDeviceTestCases', '--include-filter', 'GtsPackageRoleEnforcementTests', '--include-filter', 'GtsPackageUninstallTestCases', '--include-filter', 'GtsPartnerBookmarksTestCases', '--include-filter', 'GtsPermissionControllerHostTestCases', '--include-filter', 'GtsPermissionTestCases', '--include-filter', 'GtsPlacementTestCases', '--include-filter', 'GtsPlayAutoInstallTestCases', '--include-filter', 'GtsPlayFsiHostTestCases', '--include-filter', 'GtsPlayFsiTestCases', '--include-filter', 'GtsPlayStoreHostTestCases', '--include-filter', 'GtsPrintTestCases', '--include-filter', 'GtsPrivacyTestCases', '--include-filter', 'GtsPropertiesTestCases', '--include-filter', 'GtsRegulationComplianceTestCases', '--include-filter', 'GtsRlzTestCases', '--include-filter', 'GtsRollbackManagerTest', '--include-filter', 'GtsSampleDeviceTestCases', '--include-filter', 'GtsSampleDynamicConfigTestCases', '--include-filter', 'GtsSampleHostTestCases', '--include-filter', 'GtsScreenshotHostTestCases', '--include-filter', 'GtsSearchHostTestCases', '--include-filter', 'GtsSecurityHostTestCases', '--include-filter', 'GtsSensorHostTestCases', '--include-filter', 'GtsSettingsHostTestCases', '--include-filter', 'GtsSettingsTestCases', '--include-filter', 'GtsSetupWizardHostTestCases', '--include-filter', 'GtsSetupWizardNoPermissionTestCases', '--include-filter', 'GtsSimAppDialogTestCases', '--include-filter', 'GtsSmartBatteryDeviceTestCases', '--include-filter', 'GtsSmsCallLogTestCases', '--include-filter', 'GtsSpeechServicesTestCases', '--include-filter', 'GtsSsaidHostTestCases', '--include-filter', 'GtsStagedInstallHostTestCases', '--include-filter', 'GtsStatsdHostTestCases', '--include-filter', 'GtsStorageTestCases', '--include-filter', 'GtsSupervisionTestCases', '--include-filter', 'GtsSuspendAppsPermissionTestCases', '--include-filter', 'GtsSuspendAppsTestCases', '--include-filter', 'GtsTelecomManagerTests', '--include-filter', 'GtsTelephonyNumberVerificationHostCases', '--include-filter', 'GtsTelephonyTestCases', '--include-filter', 'GtsTestHarnessModeTestCases', '--include-filter', 'GtsTetheringTestCases', '--include-filter', 'GtsTvBugReportTestCases', '--include-filter', 'GtsTvHostTestCases', '--include-filter', 'GtsTvTestCases', '--include-filter', 'GtsUnofficialApisUsageTestCases', '--include-filter', 'GtsUsageStatsTestCases', '--include-filter', 'GtsUserspaceRebootHostSideTestCases', '--include-filter', 'GtsViewTestCases', '--include-filter', 'GtsVndkDependencyTestCases', '--include-filter', 'GtsWebViewHostTestCases', '--include-filter', 'GtsWebViewTestCases', '--include-filter', 'GtsWellbeingHostTestCases', '--include-filter', 'GtsWellbeingPermissionPolicyTestCases', '--include-filter', 'GtsWellbeingTestCases', '--include-filter', 'GtsYouTubeTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases',
-        target_plan=None,
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.arm.GtsMediaTestCases.32 b/server/site_tests/cheets_GTS_R/control.9.0_r1.arm.GtsMediaTestCases.32
deleted file mode 100644
index d9f5db2..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.arm.GtsMediaTestCases.32
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.arm.GtsMediaTestCases.32'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) using arm ABI in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.arm.GtsMediaTestCases.32',
-        test_name='cheets_GTS_R.9.0_r1.arm.GtsMediaTestCases.32',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure', '--abi', 'armeabi-v7a'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMediaTestCases',
-        target_plan=None,
-        bundle='arm',
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=36000)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.arm.GtsMediaTestCases.64 b/server/site_tests/cheets_GTS_R/control.9.0_r1.arm.GtsMediaTestCases.64
deleted file mode 100644
index 76b6755..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.arm.GtsMediaTestCases.64
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.arm.GtsMediaTestCases.64'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) using arm ABI in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.arm.GtsMediaTestCases.64',
-        test_name='cheets_GTS_R.9.0_r1.arm.GtsMediaTestCases.64',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure', '--abi', 'arm64-v8a'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMediaTestCases',
-        target_plan=None,
-        bundle='arm',
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=36000)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.arm.all.GtsMediaTestCases_-_GtsMediaTestCases.32 b/server/site_tests/cheets_GTS_R/control.9.0_r1.arm.all.GtsMediaTestCases_-_GtsMediaTestCases.32
deleted file mode 100644
index 8a16a36..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.arm.all.GtsMediaTestCases_-_GtsMediaTestCases.32
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.arm.all.GtsMediaTestCases_-_GtsMediaTestCases.32'
-ATTRIBUTES = 'suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) using arm ABI in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='9.0_r1.arm.all.GtsMediaTestCases_-_GtsMediaTestCases.32',
-        test_name='cheets_GTS_R.9.0_r1.arm.all.GtsMediaTestCases_-_GtsMediaTestCases.32',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure', '--abi', 'armeabi-v7a'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='all.GtsMediaTestCases_-_GtsMediaTestCases',
-        target_plan=None,
-        bundle='arm',
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.arm.all.GtsMediaTestCases_-_GtsMediaTestCases.64 b/server/site_tests/cheets_GTS_R/control.9.0_r1.arm.all.GtsMediaTestCases_-_GtsMediaTestCases.64
deleted file mode 100644
index 48f863f..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.arm.all.GtsMediaTestCases_-_GtsMediaTestCases.64
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.arm.all.GtsMediaTestCases_-_GtsMediaTestCases.64'
-ATTRIBUTES = 'suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) using arm ABI in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='9.0_r1.arm.all.GtsMediaTestCases_-_GtsMediaTestCases.64',
-        test_name='cheets_GTS_R.9.0_r1.arm.all.GtsMediaTestCases_-_GtsMediaTestCases.64',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure', '--abi', 'arm64-v8a'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='all.GtsMediaTestCases_-_GtsMediaTestCases',
-        target_plan=None,
-        bundle='arm',
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_GTS_R/control.9.0_r1.tradefed-run-collect-tests-only-internal
deleted file mode 100644
index c5448c7..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.tradefed-run-collect-tests-only-internal
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.tradefed-run-collect-tests-only-internal'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts, suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 0
-TEST_TYPE = 'server'
-TIME = 'LENGTHY'
-MAX_RESULT_SIZE_KB = 512000
-DOC = 'Run all of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=0,
-        tag='9.0_r1.tradefed-run-collect-tests-only-internal',
-        test_name='cheets_GTS_R.9.0_r1.tradefed-run-collect-tests-only-internal',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'GtsYouTubeTestCases:skip-media-download:true'],
-        retry_template=None,
-        target_module=None,
-        target_plan=None,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=1800)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.x86.GtsMediaTestCases.32 b/server/site_tests/cheets_GTS_R/control.9.0_r1.x86.GtsMediaTestCases.32
deleted file mode 100644
index 60dc907..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.x86.GtsMediaTestCases.32
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.x86.GtsMediaTestCases.32'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) using x86 ABI in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.x86.GtsMediaTestCases.32',
-        test_name='cheets_GTS_R.9.0_r1.x86.GtsMediaTestCases.32',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure', '--abi', 'x86'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMediaTestCases',
-        target_plan=None,
-        bundle='x86',
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=36000)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.x86.GtsMediaTestCases.64 b/server/site_tests/cheets_GTS_R/control.9.0_r1.x86.GtsMediaTestCases.64
deleted file mode 100644
index 3e8ecda..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.x86.GtsMediaTestCases.64
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.x86.GtsMediaTestCases.64'
-ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) using x86 ABI in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        tag='9.0_r1.x86.GtsMediaTestCases.64',
-        test_name='cheets_GTS_R.9.0_r1.x86.GtsMediaTestCases.64',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure', '--abi', 'x86_64'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMediaTestCases',
-        target_plan=None,
-        bundle='x86',
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=36000)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.x86.all.GtsMediaTestCases_-_GtsMediaTestCases.32 b/server/site_tests/cheets_GTS_R/control.9.0_r1.x86.all.GtsMediaTestCases_-_GtsMediaTestCases.32
deleted file mode 100644
index d90efd0..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.x86.all.GtsMediaTestCases_-_GtsMediaTestCases.32
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.x86.all.GtsMediaTestCases_-_GtsMediaTestCases.32'
-ATTRIBUTES = 'suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) using x86 ABI in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='9.0_r1.x86.all.GtsMediaTestCases_-_GtsMediaTestCases.32',
-        test_name='cheets_GTS_R.9.0_r1.x86.all.GtsMediaTestCases_-_GtsMediaTestCases.32',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure', '--abi', 'x86'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='all.GtsMediaTestCases_-_GtsMediaTestCases',
-        target_plan=None,
-        bundle='x86',
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.9.0_r1.x86.all.GtsMediaTestCases_-_GtsMediaTestCases.64 b/server/site_tests/cheets_GTS_R/control.9.0_r1.x86.all.GtsMediaTestCases_-_GtsMediaTestCases.64
deleted file mode 100644
index 4cbd470..0000000
--- a/server/site_tests/cheets_GTS_R/control.9.0_r1.x86.all.GtsMediaTestCases_-_GtsMediaTestCases.64
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.9.0_r1.x86.all.GtsMediaTestCases_-_GtsMediaTestCases.64'
-ATTRIBUTES = 'suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) using x86 ABI in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='9.0_r1.x86.all.GtsMediaTestCases_-_GtsMediaTestCases.64',
-        test_name='cheets_GTS_R.9.0_r1.x86.all.GtsMediaTestCases_-_GtsMediaTestCases.64',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure', '--abi', 'x86_64'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='all.GtsMediaTestCases_-_GtsMediaTestCases',
-        target_plan=None,
-        bundle='x86',
-        uri='LATEST',
-        precondition_commands=['cras_test_client --mute 1'],
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.CtsEdiHostTestCases b/server/site_tests/cheets_GTS_R/control.CtsEdiHostTestCases
deleted file mode 100644
index bdb8242..0000000
--- a/server/site_tests/cheets_GTS_R/control.CtsEdiHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.CtsEdiHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module CtsEdiHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='CtsEdiHostTestCases',
-        test_name='cheets_GTS_R.CtsEdiHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'CtsEdiHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='CtsEdiHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsAccountsHostTestCases
deleted file mode 100644
index 7fd7160..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsAccountsHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsAccountsHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAccountsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAccountsHostTestCases',
-        test_name='cheets_GTS_R.GtsAccountsHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAccountsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAccountsHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsAdminTestCases b/server/site_tests/cheets_GTS_R/control.GtsAdminTestCases
deleted file mode 100644
index b65ebc3..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsAdminTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsAdminTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAdminTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAdminTestCases',
-        test_name='cheets_GTS_R.GtsAdminTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAdminTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAdminTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsAfwTestCases b/server/site_tests/cheets_GTS_R/control.GtsAfwTestCases
deleted file mode 100644
index 62be533..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsAfwTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsAfwTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAfwTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAfwTestCases',
-        test_name='cheets_GTS_R.GtsAfwTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAfwTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAfwTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsAndroidAutoDeviceTestCases b/server/site_tests/cheets_GTS_R/control.GtsAndroidAutoDeviceTestCases
deleted file mode 100644
index 0afaac6..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsAndroidAutoDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsAndroidAutoDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAndroidAutoDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAndroidAutoDeviceTestCases',
-        test_name='cheets_GTS_R.GtsAndroidAutoDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAndroidAutoDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAndroidAutoDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsAppBlacklistDeviceTestCases b/server/site_tests/cheets_GTS_R/control.GtsAppBlacklistDeviceTestCases
deleted file mode 100644
index 0d80230..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsAppBlacklistDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsAppBlacklistDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAppBlacklistDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAppBlacklistDeviceTestCases',
-        test_name='cheets_GTS_R.GtsAppBlacklistDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAppBlacklistDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAppBlacklistDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsAppTestCases b/server/site_tests/cheets_GTS_R/control.GtsAppTestCases
deleted file mode 100644
index 6126780..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsAppTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsAppTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAppTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAppTestCases',
-        test_name='cheets_GTS_R.GtsAppTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAppTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAppTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsAppVisibilityDeviceTestCases b/server/site_tests/cheets_GTS_R/control.GtsAppVisibilityDeviceTestCases
deleted file mode 100644
index eebf911..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsAppVisibilityDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsAppVisibilityDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAppVisibilityDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAppVisibilityDeviceTestCases',
-        test_name='cheets_GTS_R.GtsAppVisibilityDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAppVisibilityDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAppVisibilityDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsArtManagerHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsArtManagerHostTestCases
deleted file mode 100644
index 753f7ae..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsArtManagerHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsArtManagerHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsArtManagerHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsArtManagerHostTestCases',
-        test_name='cheets_GTS_R.GtsArtManagerHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsArtManagerHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsArtManagerHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsAssistIntentTestCases b/server/site_tests/cheets_GTS_R/control.GtsAssistIntentTestCases
deleted file mode 100644
index 9fd0ba0..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsAssistIntentTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsAssistIntentTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAssistIntentTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAssistIntentTestCases',
-        test_name='cheets_GTS_R.GtsAssistIntentTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAssistIntentTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAssistIntentTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsAssistantHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsAssistantHostTestCases
deleted file mode 100644
index 99b60f2..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsAssistantHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsAssistantHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAssistantHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAssistantHostTestCases',
-        test_name='cheets_GTS_R.GtsAssistantHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAssistantHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAssistantHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsAssistantMicHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsAssistantMicHostTestCases
deleted file mode 100644
index 7add8cf..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsAssistantMicHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsAssistantMicHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAssistantMicHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAssistantMicHostTestCases',
-        test_name='cheets_GTS_R.GtsAssistantMicHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAssistantMicHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAssistantMicHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsAssistantWorkProfileHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsAssistantWorkProfileHostTestCases
deleted file mode 100644
index 854d6fc..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsAssistantWorkProfileHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsAssistantWorkProfileHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAssistantWorkProfileHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAssistantWorkProfileHostTestCases',
-        test_name='cheets_GTS_R.GtsAssistantWorkProfileHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAssistantWorkProfileHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAssistantWorkProfileHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsAudioTestCases b/server/site_tests/cheets_GTS_R/control.GtsAudioTestCases
deleted file mode 100644
index 29c6bb6..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsAudioTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsAudioTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAudioTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsAudioTestCases',
-        test_name='cheets_GTS_R.GtsAudioTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAudioTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAudioTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsBackupHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsBackupHostTestCases
deleted file mode 100644
index 142a0f6..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsBackupHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsBackupHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsBackupHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsBackupHostTestCases',
-        test_name='cheets_GTS_R.GtsBackupHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsBackupHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsBackupHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=1800)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsBackupTestCases b/server/site_tests/cheets_GTS_R/control.GtsBackupTestCases
deleted file mode 100644
index 7485772..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsBackupTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsBackupTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsBackupTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsBackupTestCases',
-        test_name='cheets_GTS_R.GtsBackupTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsBackupTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsBackupTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsBootHealthHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsBootHealthHostTestCases
deleted file mode 100644
index 34ce297..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsBootHealthHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsBootHealthHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsBootHealthHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsBootHealthHostTestCases',
-        test_name='cheets_GTS_R.GtsBootHealthHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsBootHealthHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsBootHealthHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsBootStatsTestCases b/server/site_tests/cheets_GTS_R/control.GtsBootStatsTestCases
deleted file mode 100644
index 93bd3b5..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsBootStatsTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsBootStatsTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsBootStatsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsBootStatsTestCases',
-        test_name='cheets_GTS_R.GtsBootStatsTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsBootStatsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsBootStatsTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsCNGCoreTestCases b/server/site_tests/cheets_GTS_R/control.GtsCNGCoreTestCases
deleted file mode 100644
index e0685e2..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsCNGCoreTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsCNGCoreTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCNGCoreTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsCNGCoreTestCases',
-        test_name='cheets_GTS_R.GtsCNGCoreTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCNGCoreTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCNGCoreTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsCalendarTests b/server/site_tests/cheets_GTS_R/control.GtsCalendarTests
deleted file mode 100644
index a7414d1..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsCalendarTests
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsCalendarTests'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCalendarTests of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsCalendarTests',
-        test_name='cheets_GTS_R.GtsCalendarTests',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCalendarTests', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCalendarTests',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsCallLogTestCases b/server/site_tests/cheets_GTS_R/control.GtsCallLogTestCases
deleted file mode 100644
index 5b85e59..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsCallLogTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsCallLogTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCallLogTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsCallLogTestCases',
-        test_name='cheets_GTS_R.GtsCallLogTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCallLogTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCallLogTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsCameraTestCases b/server/site_tests/cheets_GTS_R/control.GtsCameraTestCases
deleted file mode 100644
index e6591ec..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsCameraTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsCameraTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCameraTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsCameraTestCases',
-        test_name='cheets_GTS_R.GtsCameraTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCameraTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCameraTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsCastHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsCastHostTestCases
deleted file mode 100644
index 580cf8e..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsCastHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsCastHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCastHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsCastHostTestCases',
-        test_name='cheets_GTS_R.GtsCastHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCastHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCastHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsContactsAppDeviceTestCases b/server/site_tests/cheets_GTS_R/control.GtsContactsAppDeviceTestCases
deleted file mode 100644
index 6bf13fe..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsContactsAppDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsContactsAppDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContactsAppDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsContactsAppDeviceTestCases',
-        test_name='cheets_GTS_R.GtsContactsAppDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContactsAppDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContactsAppDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsContactsTest b/server/site_tests/cheets_GTS_R/control.GtsContactsTest
deleted file mode 100644
index c1e5905..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsContactsTest
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsContactsTest'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContactsTest of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsContactsTest',
-        test_name='cheets_GTS_R.GtsContactsTest',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContactsTest', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContactsTest',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsContentHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsContentHostTestCases
deleted file mode 100644
index ac8452e..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsContentHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsContentHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContentHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsContentHostTestCases',
-        test_name='cheets_GTS_R.GtsContentHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContentHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContentHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsContentTestCases b/server/site_tests/cheets_GTS_R/control.GtsContentTestCases
deleted file mode 100644
index a0c55ef..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsContentTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsContentTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContentTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsContentTestCases',
-        test_name='cheets_GTS_R.GtsContentTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContentTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContentTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsContextHubPermissionDeviceTestCases b/server/site_tests/cheets_GTS_R/control.GtsContextHubPermissionDeviceTestCases
deleted file mode 100644
index c4155ef..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsContextHubPermissionDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsContextHubPermissionDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsContextHubPermissionDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsContextHubPermissionDeviceTestCases',
-        test_name='cheets_GTS_R.GtsContextHubPermissionDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContextHubPermissionDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsContextHubPermissionDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsDebugfsMountTestCases b/server/site_tests/cheets_GTS_R/control.GtsDebugfsMountTestCases
deleted file mode 100644
index f5c094b..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsDebugfsMountTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsDebugfsMountTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDebugfsMountTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDebugfsMountTestCases',
-        test_name='cheets_GTS_R.GtsDebugfsMountTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDebugfsMountTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDebugfsMountTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsDeviceConfigTestCases b/server/site_tests/cheets_GTS_R/control.GtsDeviceConfigTestCases
deleted file mode 100644
index bd0208f..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsDeviceConfigTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsDeviceConfigTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDeviceConfigTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDeviceConfigTestCases',
-        test_name='cheets_GTS_R.GtsDeviceConfigTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDeviceConfigTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDeviceConfigTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsDevicePolicyHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsDevicePolicyHostTestCases
deleted file mode 100644
index 77b08b8..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsDevicePolicyHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsDevicePolicyHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDevicePolicyHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDevicePolicyHostTestCases',
-        test_name='cheets_GTS_R.GtsDevicePolicyHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDevicePolicyHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDevicePolicyHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsDevicePolicyTestCases b/server/site_tests/cheets_GTS_R/control.GtsDevicePolicyTestCases
deleted file mode 100644
index 2e61822..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsDevicePolicyTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsDevicePolicyTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDevicePolicyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDevicePolicyTestCases',
-        test_name='cheets_GTS_R.GtsDevicePolicyTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDevicePolicyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDevicePolicyTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsDexModuleRegistrationTestCases b/server/site_tests/cheets_GTS_R/control.GtsDexModuleRegistrationTestCases
deleted file mode 100644
index c125464..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsDexModuleRegistrationTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsDexModuleRegistrationTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDexModuleRegistrationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDexModuleRegistrationTestCases',
-        test_name='cheets_GTS_R.GtsDexModuleRegistrationTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDexModuleRegistrationTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDexModuleRegistrationTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsDialerAudioTestCases b/server/site_tests/cheets_GTS_R/control.GtsDialerAudioTestCases
deleted file mode 100644
index 2b62dcd..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsDialerAudioTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsDialerAudioTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDialerAudioTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDialerAudioTestCases',
-        test_name='cheets_GTS_R.GtsDialerAudioTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDialerAudioTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDialerAudioTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsDialerDeviceTestCases b/server/site_tests/cheets_GTS_R/control.GtsDialerDeviceTestCases
deleted file mode 100644
index 4884d13..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsDialerDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsDialerDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDialerDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDialerDeviceTestCases',
-        test_name='cheets_GTS_R.GtsDialerDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDialerDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDialerDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsDozeDeviceTestCases b/server/site_tests/cheets_GTS_R/control.GtsDozeDeviceTestCases
deleted file mode 100644
index 4ab15f9..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsDozeDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsDozeDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDozeDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDozeDeviceTestCases',
-        test_name='cheets_GTS_R.GtsDozeDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDozeDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDozeDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsDozeHostSideTestCases b/server/site_tests/cheets_GTS_R/control.GtsDozeHostSideTestCases
deleted file mode 100644
index 3d466d5..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsDozeHostSideTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsDozeHostSideTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDozeHostSideTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDozeHostSideTestCases',
-        test_name='cheets_GTS_R.GtsDozeHostSideTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDozeHostSideTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDozeHostSideTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsDuoReadyTestCases b/server/site_tests/cheets_GTS_R/control.GtsDuoReadyTestCases
deleted file mode 100644
index c7307b2..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsDuoReadyTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsDuoReadyTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDuoReadyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsDuoReadyTestCases',
-        test_name='cheets_GTS_R.GtsDuoReadyTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDuoReadyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDuoReadyTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsEdiHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsEdiHostTestCases
deleted file mode 100644
index cd4c1c3..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsEdiHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsEdiHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsEdiHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsEdiHostTestCases',
-        test_name='cheets_GTS_R.GtsEdiHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsEdiHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsEdiHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsExoPlayerTestCases b/server/site_tests/cheets_GTS_R/control.GtsExoPlayerTestCases
deleted file mode 100644
index c22222807..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsExoPlayerTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsExoPlayerTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsExoPlayerTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsExoPlayerTestCases',
-        test_name='cheets_GTS_R.GtsExoPlayerTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsExoPlayerTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsExoPlayerTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=5400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsFeaturesTestCases b/server/site_tests/cheets_GTS_R/control.GtsFeaturesTestCases
deleted file mode 100644
index fcb6b09..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsFeaturesTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsFeaturesTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsFeaturesTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsFeaturesTestCases',
-        test_name='cheets_GTS_R.GtsFeaturesTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFeaturesTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsFeaturesTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsFilesByGoogleTestCases b/server/site_tests/cheets_GTS_R/control.GtsFilesByGoogleTestCases
deleted file mode 100644
index 01bf84d..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsFilesByGoogleTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsFilesByGoogleTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsFilesByGoogleTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsFilesByGoogleTestCases',
-        test_name='cheets_GTS_R.GtsFilesByGoogleTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFilesByGoogleTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsFilesByGoogleTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsFontHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsFontHostTestCases
deleted file mode 100644
index 2340d72..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsFontHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsFontHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsFontHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsFontHostTestCases',
-        test_name='cheets_GTS_R.GtsFontHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFontHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsFontHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsGameOverlayTestCases b/server/site_tests/cheets_GTS_R/control.GtsGameOverlayTestCases
deleted file mode 100644
index 1f54c92..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsGameOverlayTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsGameOverlayTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameOverlayTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsGameOverlayTestCases',
-        test_name='cheets_GTS_R.GtsGameOverlayTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameOverlayTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameOverlayTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsGmscoreHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsGmscoreHostTestCases
deleted file mode 100644
index a9cddd2..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsGmscoreHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsGmscoreHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGmscoreHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsGmscoreHostTestCases',
-        test_name='cheets_GTS_R.GtsGmscoreHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGmscoreHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGmscoreHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsGraphicsHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsGraphicsHostTestCases
deleted file mode 100644
index 2261b8c..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsGraphicsHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsGraphicsHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGraphicsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsGraphicsHostTestCases',
-        test_name='cheets_GTS_R.GtsGraphicsHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGraphicsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGraphicsHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsHomeHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsHomeHostTestCases
deleted file mode 100644
index fa571d8..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsHomeHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsHomeHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsHomeHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsHomeHostTestCases',
-        test_name='cheets_GTS_R.GtsHomeHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsHomeHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsHomeHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsIncidentConfirmationTestCases b/server/site_tests/cheets_GTS_R/control.GtsIncidentConfirmationTestCases
deleted file mode 100644
index f8b0b20..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsIncidentConfirmationTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsIncidentConfirmationTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncidentConfirmationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsIncidentConfirmationTestCases',
-        test_name='cheets_GTS_R.GtsIncidentConfirmationTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncidentConfirmationTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncidentConfirmationTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsIncidentManagerTestCases b/server/site_tests/cheets_GTS_R/control.GtsIncidentManagerTestCases
deleted file mode 100644
index 715fddb..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsIncidentManagerTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsIncidentManagerTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncidentManagerTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsIncidentManagerTestCases',
-        test_name='cheets_GTS_R.GtsIncidentManagerTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncidentManagerTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncidentManagerTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsIncrementalInstallProxyHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsIncrementalInstallProxyHostTestCases
deleted file mode 100644
index ce6d9f0..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsIncrementalInstallProxyHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsIncrementalInstallProxyHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncrementalInstallProxyHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsIncrementalInstallProxyHostTestCases',
-        test_name='cheets_GTS_R.GtsIncrementalInstallProxyHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncrementalInstallProxyHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncrementalInstallProxyHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsIncrementalInstallTestCases b/server/site_tests/cheets_GTS_R/control.GtsIncrementalInstallTestCases
deleted file mode 100644
index 92e1430..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsIncrementalInstallTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsIncrementalInstallTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncrementalInstallTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsIncrementalInstallTestCases',
-        test_name='cheets_GTS_R.GtsIncrementalInstallTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncrementalInstallTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncrementalInstallTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsIncrementalInstallTestCases_BackgroundProcess b/server/site_tests/cheets_GTS_R/control.GtsIncrementalInstallTestCases_BackgroundProcess
deleted file mode 100644
index 0e7b90b..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsIncrementalInstallTestCases_BackgroundProcess
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsIncrementalInstallTestCases_BackgroundProcess'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncrementalInstallTestCases_BackgroundProcess of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsIncrementalInstallTestCases_BackgroundProcess',
-        test_name='cheets_GTS_R.GtsIncrementalInstallTestCases_BackgroundProcess',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncrementalInstallTestCases_BackgroundProcess', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncrementalInstallTestCases_BackgroundProcess',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsInstallPackagesWhitelistDeviceTestCases b/server/site_tests/cheets_GTS_R/control.GtsInstallPackagesWhitelistDeviceTestCases
deleted file mode 100644
index f405802..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsInstallPackagesWhitelistDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsInstallPackagesWhitelistDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsInstallPackagesWhitelistDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsInstallPackagesWhitelistDeviceTestCases',
-        test_name='cheets_GTS_R.GtsInstallPackagesWhitelistDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallPackagesWhitelistDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallPackagesWhitelistDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsInstantAppsHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsInstantAppsHostTestCases
deleted file mode 100644
index 15afe7c6..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsInstantAppsHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsInstantAppsHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsInstantAppsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsInstantAppsHostTestCases',
-        test_name='cheets_GTS_R.GtsInstantAppsHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstantAppsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstantAppsHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsJniUncompressHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsJniUncompressHostTestCases
deleted file mode 100644
index 71ac95c..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsJniUncompressHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsJniUncompressHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsJniUncompressHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsJniUncompressHostTestCases',
-        test_name='cheets_GTS_R.GtsJniUncompressHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsJniUncompressHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsJniUncompressHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsKidsHomeHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsKidsHomeHostTestCases
deleted file mode 100644
index 606a376..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsKidsHomeHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsKidsHomeHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsKidsHomeHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsKidsHomeHostTestCases',
-        test_name='cheets_GTS_R.GtsKidsHomeHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsKidsHomeHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsKidsHomeHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsLargeApkHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsLargeApkHostTestCases
deleted file mode 100644
index 0a79d5e..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsLargeApkHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsLargeApkHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLargeApkHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsLargeApkHostTestCases',
-        test_name='cheets_GTS_R.GtsLargeApkHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLargeApkHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLargeApkHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsLensTestCases b/server/site_tests/cheets_GTS_R/control.GtsLensTestCases
deleted file mode 100644
index 9c0634c..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsLensTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsLensTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLensTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsLensTestCases',
-        test_name='cheets_GTS_R.GtsLensTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLensTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLensTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsLinkerConfigTestCases b/server/site_tests/cheets_GTS_R/control.GtsLinkerConfigTestCases
deleted file mode 100644
index ddbf8e4..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsLinkerConfigTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsLinkerConfigTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLinkerConfigTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsLinkerConfigTestCases',
-        test_name='cheets_GTS_R.GtsLinkerConfigTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLinkerConfigTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLinkerConfigTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsLocationHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsLocationHostTestCases
deleted file mode 100644
index a39e5c7..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsLocationHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsLocationHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLocationHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsLocationHostTestCases',
-        test_name='cheets_GTS_R.GtsLocationHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLocationHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLocationHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsLocationTestCases b/server/site_tests/cheets_GTS_R/control.GtsLocationTestCases
deleted file mode 100644
index c585a3c..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsLocationTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsLocationTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLocationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsLocationTestCases',
-        test_name='cheets_GTS_R.GtsLocationTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLocationTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLocationTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsMbaPrivilegedPermissionTestCases b/server/site_tests/cheets_GTS_R/control.GtsMbaPrivilegedPermissionTestCases
deleted file mode 100644
index 3d3c373..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsMbaPrivilegedPermissionTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsMbaPrivilegedPermissionTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMbaPrivilegedPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsMbaPrivilegedPermissionTestCases',
-        test_name='cheets_GTS_R.GtsMbaPrivilegedPermissionTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMbaPrivilegedPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMbaPrivilegedPermissionTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsMemoryHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsMemoryHostTestCases
deleted file mode 100644
index 186e03c..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsMemoryHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsMemoryHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMemoryHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsMemoryHostTestCases',
-        test_name='cheets_GTS_R.GtsMemoryHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMemoryHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMemoryHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsMemoryTestCases b/server/site_tests/cheets_GTS_R/control.GtsMemoryTestCases
deleted file mode 100644
index 64d9e4a..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsMemoryTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsMemoryTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsMemoryTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsMemoryTestCases',
-        test_name='cheets_GTS_R.GtsMemoryTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMemoryTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMemoryTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsModuleMetadataTestCases b/server/site_tests/cheets_GTS_R/control.GtsModuleMetadataTestCases
deleted file mode 100644
index 9a726f6..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsModuleMetadataTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsModuleMetadataTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsModuleMetadataTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsModuleMetadataTestCases',
-        test_name='cheets_GTS_R.GtsModuleMetadataTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsModuleMetadataTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsModuleMetadataTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsNetStatsHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsNetStatsHostTestCases
deleted file mode 100644
index 5d0d5ae..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsNetStatsHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsNetStatsHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNetStatsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNetStatsHostTestCases',
-        test_name='cheets_GTS_R.GtsNetStatsHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNetStatsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNetStatsHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsNetTestCases b/server/site_tests/cheets_GTS_R/control.GtsNetTestCases
deleted file mode 100644
index 7226fe5..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsNetTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsNetTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNetTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNetTestCases',
-        test_name='cheets_GTS_R.GtsNetTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNetTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNetTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsNetworkStackHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsNetworkStackHostTestCases
deleted file mode 100644
index d67ad27..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsNetworkStackHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsNetworkStackHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNetworkStackHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNetworkStackHostTestCases',
-        test_name='cheets_GTS_R.GtsNetworkStackHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNetworkStackHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNetworkStackHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsNetworkWatchlistTestCases b/server/site_tests/cheets_GTS_R/control.GtsNetworkWatchlistTestCases
deleted file mode 100644
index 2121b0f..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsNetworkWatchlistTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsNetworkWatchlistTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNetworkWatchlistTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNetworkWatchlistTestCases',
-        test_name='cheets_GTS_R.GtsNetworkWatchlistTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNetworkWatchlistTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNetworkWatchlistTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsNmgiarcTestCases b/server/site_tests/cheets_GTS_R/control.GtsNmgiarcTestCases
deleted file mode 100644
index 0dd9383..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsNmgiarcTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsNmgiarcTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNmgiarcTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNmgiarcTestCases',
-        test_name='cheets_GTS_R.GtsNmgiarcTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNmgiarcTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNmgiarcTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsNoPermissionTestCases b/server/site_tests/cheets_GTS_R/control.GtsNoPermissionTestCases
deleted file mode 100644
index 359fd13..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsNoPermissionTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsNoPermissionTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNoPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNoPermissionTestCases',
-        test_name='cheets_GTS_R.GtsNoPermissionTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNoPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNoPermissionTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsNoPermissionTestCases25 b/server/site_tests/cheets_GTS_R/control.GtsNoPermissionTestCases25
deleted file mode 100644
index b014075..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsNoPermissionTestCases25
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsNoPermissionTestCases25'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNoPermissionTestCases25 of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNoPermissionTestCases25',
-        test_name='cheets_GTS_R.GtsNoPermissionTestCases25',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNoPermissionTestCases25', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNoPermissionTestCases25',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsNotificationTestCases b/server/site_tests/cheets_GTS_R/control.GtsNotificationTestCases
deleted file mode 100644
index 7e06b6a..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsNotificationTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsNotificationTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsNotificationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsNotificationTestCases',
-        test_name='cheets_GTS_R.GtsNotificationTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNotificationTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsNotificationTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS_R/control.GtsOemLockServiceTestCases
deleted file mode 100644
index bae1d3e..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsOemLockServiceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsOemLockServiceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsOemLockServiceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsOemLockServiceTestCases',
-        test_name='cheets_GTS_R.GtsOemLockServiceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsOemLockServiceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsOemLockServiceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsOsTestCases b/server/site_tests/cheets_GTS_R/control.GtsOsTestCases
deleted file mode 100644
index 5072a01..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsOsTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsOsTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsOsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsOsTestCases',
-        test_name='cheets_GTS_R.GtsOsTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsOsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsOsTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPackageInstallTestCases b/server/site_tests/cheets_GTS_R/control.GtsPackageInstallTestCases
deleted file mode 100644
index d73ae27..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPackageInstallTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPackageInstallTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageInstallTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPackageInstallTestCases',
-        test_name='cheets_GTS_R.GtsPackageInstallTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPackageInstallTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPackageInstallTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPackageInstallerTapjackingTestCases b/server/site_tests/cheets_GTS_R/control.GtsPackageInstallerTapjackingTestCases
deleted file mode 100644
index 5f352b7..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPackageInstallerTapjackingTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPackageInstallerTapjackingTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageInstallerTapjackingTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPackageInstallerTapjackingTestCases',
-        test_name='cheets_GTS_R.GtsPackageInstallerTapjackingTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPackageInstallerTapjackingTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPackageInstallerTapjackingTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPackageManagerHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsPackageManagerHostTestCases
deleted file mode 100644
index 372b377..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPackageManagerHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPackageManagerHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageManagerHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPackageManagerHostTestCases',
-        test_name='cheets_GTS_R.GtsPackageManagerHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPackageManagerHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPackageManagerHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPackageNameCertPairsDeviceTestCases b/server/site_tests/cheets_GTS_R/control.GtsPackageNameCertPairsDeviceTestCases
deleted file mode 100644
index 1474e31..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPackageNameCertPairsDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPackageNameCertPairsDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageNameCertPairsDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPackageNameCertPairsDeviceTestCases',
-        test_name='cheets_GTS_R.GtsPackageNameCertPairsDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPackageNameCertPairsDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPackageNameCertPairsDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPackageRoleEnforcementTests b/server/site_tests/cheets_GTS_R/control.GtsPackageRoleEnforcementTests
deleted file mode 100644
index c12491a..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPackageRoleEnforcementTests
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPackageRoleEnforcementTests'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageRoleEnforcementTests of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPackageRoleEnforcementTests',
-        test_name='cheets_GTS_R.GtsPackageRoleEnforcementTests',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPackageRoleEnforcementTests', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPackageRoleEnforcementTests',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPackageUninstallTestCases b/server/site_tests/cheets_GTS_R/control.GtsPackageUninstallTestCases
deleted file mode 100644
index 240a70a..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPackageUninstallTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPackageUninstallTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageUninstallTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPackageUninstallTestCases',
-        test_name='cheets_GTS_R.GtsPackageUninstallTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPackageUninstallTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPackageUninstallTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPartnerBookmarksTestCases b/server/site_tests/cheets_GTS_R/control.GtsPartnerBookmarksTestCases
deleted file mode 100644
index 45493e9..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPartnerBookmarksTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPartnerBookmarksTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPartnerBookmarksTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPartnerBookmarksTestCases',
-        test_name='cheets_GTS_R.GtsPartnerBookmarksTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPartnerBookmarksTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPartnerBookmarksTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPermissionControllerHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsPermissionControllerHostTestCases
deleted file mode 100644
index 72532f8..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPermissionControllerHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPermissionControllerHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPermissionControllerHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPermissionControllerHostTestCases',
-        test_name='cheets_GTS_R.GtsPermissionControllerHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPermissionControllerHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPermissionControllerHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPermissionTestCases b/server/site_tests/cheets_GTS_R/control.GtsPermissionTestCases
deleted file mode 100644
index 77df72f..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPermissionTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPermissionTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPermissionTestCases',
-        test_name='cheets_GTS_R.GtsPermissionTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPermissionTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPlacementTestCases b/server/site_tests/cheets_GTS_R/control.GtsPlacementTestCases
deleted file mode 100644
index deea03c..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPlacementTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPlacementTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPlacementTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPlacementTestCases',
-        test_name='cheets_GTS_R.GtsPlacementTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlacementTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPlacementTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPlayAutoInstallTestCases b/server/site_tests/cheets_GTS_R/control.GtsPlayAutoInstallTestCases
deleted file mode 100644
index 0efdfc8..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPlayAutoInstallTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPlayAutoInstallTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPlayAutoInstallTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPlayAutoInstallTestCases',
-        test_name='cheets_GTS_R.GtsPlayAutoInstallTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlayAutoInstallTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPlayAutoInstallTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPlayFsiHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsPlayFsiHostTestCases
deleted file mode 100644
index c688dc5..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPlayFsiHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPlayFsiHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPlayFsiHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPlayFsiHostTestCases',
-        test_name='cheets_GTS_R.GtsPlayFsiHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlayFsiHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPlayFsiHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPlayFsiTestCases b/server/site_tests/cheets_GTS_R/control.GtsPlayFsiTestCases
deleted file mode 100644
index 0b8a997..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPlayFsiTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPlayFsiTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPlayFsiTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPlayFsiTestCases',
-        test_name='cheets_GTS_R.GtsPlayFsiTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlayFsiTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPlayFsiTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPlayStoreHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsPlayStoreHostTestCases
deleted file mode 100644
index af0d7fc..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPlayStoreHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPlayStoreHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPlayStoreHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPlayStoreHostTestCases',
-        test_name='cheets_GTS_R.GtsPlayStoreHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlayStoreHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPlayStoreHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPrintTestCases b/server/site_tests/cheets_GTS_R/control.GtsPrintTestCases
deleted file mode 100644
index 00a1b58..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPrintTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPrintTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPrintTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPrintTestCases',
-        test_name='cheets_GTS_R.GtsPrintTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrintTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPrintTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPrivacyTestCases b/server/site_tests/cheets_GTS_R/control.GtsPrivacyTestCases
deleted file mode 100644
index ec9fe41..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPrivacyTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPrivacyTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPrivacyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPrivacyTestCases',
-        test_name='cheets_GTS_R.GtsPrivacyTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrivacyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPrivacyTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsPropertiesTestCases b/server/site_tests/cheets_GTS_R/control.GtsPropertiesTestCases
deleted file mode 100644
index 7d973a9..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsPropertiesTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsPropertiesTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPropertiesTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPropertiesTestCases',
-        test_name='cheets_GTS_R.GtsPropertiesTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPropertiesTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPropertiesTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsRegulationComplianceTestCases b/server/site_tests/cheets_GTS_R/control.GtsRegulationComplianceTestCases
deleted file mode 100644
index 61641f0..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsRegulationComplianceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsRegulationComplianceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsRegulationComplianceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsRegulationComplianceTestCases',
-        test_name='cheets_GTS_R.GtsRegulationComplianceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRegulationComplianceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsRegulationComplianceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsRlzTestCases b/server/site_tests/cheets_GTS_R/control.GtsRlzTestCases
deleted file mode 100644
index 6cdc906..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsRlzTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsRlzTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsRlzTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsRlzTestCases',
-        test_name='cheets_GTS_R.GtsRlzTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRlzTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsRlzTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsRollbackManagerTest b/server/site_tests/cheets_GTS_R/control.GtsRollbackManagerTest
deleted file mode 100644
index 5faf8df..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsRollbackManagerTest
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsRollbackManagerTest'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsRollbackManagerTest of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsRollbackManagerTest',
-        test_name='cheets_GTS_R.GtsRollbackManagerTest',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRollbackManagerTest', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsRollbackManagerTest',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSampleDeviceTestCases b/server/site_tests/cheets_GTS_R/control.GtsSampleDeviceTestCases
deleted file mode 100644
index 683c421..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSampleDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSampleDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSampleDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSampleDeviceTestCases',
-        test_name='cheets_GTS_R.GtsSampleDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSampleDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSampleDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSampleDynamicConfigTestCases b/server/site_tests/cheets_GTS_R/control.GtsSampleDynamicConfigTestCases
deleted file mode 100644
index 3f8c0e1..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSampleDynamicConfigTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSampleDynamicConfigTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSampleDynamicConfigTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSampleDynamicConfigTestCases',
-        test_name='cheets_GTS_R.GtsSampleDynamicConfigTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSampleDynamicConfigTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSampleDynamicConfigTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSampleHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsSampleHostTestCases
deleted file mode 100644
index 9245ada..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSampleHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSampleHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSampleHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSampleHostTestCases',
-        test_name='cheets_GTS_R.GtsSampleHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSampleHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSampleHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsScreenshotHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsScreenshotHostTestCases
deleted file mode 100644
index a6d9e66..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsScreenshotHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsScreenshotHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsScreenshotHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsScreenshotHostTestCases',
-        test_name='cheets_GTS_R.GtsScreenshotHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsScreenshotHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsScreenshotHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSearchHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsSearchHostTestCases
deleted file mode 100644
index 7679d7f..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSearchHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSearchHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSearchHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSearchHostTestCases',
-        test_name='cheets_GTS_R.GtsSearchHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSearchHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSearchHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSecurityHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsSecurityHostTestCases
deleted file mode 100644
index 355e181..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSecurityHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSecurityHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSecurityHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSecurityHostTestCases',
-        test_name='cheets_GTS_R.GtsSecurityHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSecurityHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSecurityHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSensorHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsSensorHostTestCases
deleted file mode 100644
index 4f1fd79..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSensorHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSensorHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSensorHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSensorHostTestCases',
-        test_name='cheets_GTS_R.GtsSensorHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSensorHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSensorHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSettingsHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsSettingsHostTestCases
deleted file mode 100644
index 52df101..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSettingsHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSettingsHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSettingsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSettingsHostTestCases',
-        test_name='cheets_GTS_R.GtsSettingsHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSettingsHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSettingsHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSettingsTestCases b/server/site_tests/cheets_GTS_R/control.GtsSettingsTestCases
deleted file mode 100644
index a75a90d..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSettingsTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSettingsTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSettingsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSettingsTestCases',
-        test_name='cheets_GTS_R.GtsSettingsTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSettingsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSettingsTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSetupWizardHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsSetupWizardHostTestCases
deleted file mode 100644
index a1f604e..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSetupWizardHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSetupWizardHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSetupWizardHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSetupWizardHostTestCases',
-        test_name='cheets_GTS_R.GtsSetupWizardHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSetupWizardHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSetupWizardHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSetupWizardNoPermissionTestCases b/server/site_tests/cheets_GTS_R/control.GtsSetupWizardNoPermissionTestCases
deleted file mode 100644
index 8395c01..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSetupWizardNoPermissionTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSetupWizardNoPermissionTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSetupWizardNoPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSetupWizardNoPermissionTestCases',
-        test_name='cheets_GTS_R.GtsSetupWizardNoPermissionTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSetupWizardNoPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSetupWizardNoPermissionTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSimAppDialogTestCases b/server/site_tests/cheets_GTS_R/control.GtsSimAppDialogTestCases
deleted file mode 100644
index 4bb0d55..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSimAppDialogTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSimAppDialogTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSimAppDialogTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSimAppDialogTestCases',
-        test_name='cheets_GTS_R.GtsSimAppDialogTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSimAppDialogTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSimAppDialogTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSmartBatteryDeviceTestCases b/server/site_tests/cheets_GTS_R/control.GtsSmartBatteryDeviceTestCases
deleted file mode 100644
index 8415b14..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSmartBatteryDeviceTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSmartBatteryDeviceTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSmartBatteryDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSmartBatteryDeviceTestCases',
-        test_name='cheets_GTS_R.GtsSmartBatteryDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSmartBatteryDeviceTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSmartBatteryDeviceTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSmsCallLogTestCases b/server/site_tests/cheets_GTS_R/control.GtsSmsCallLogTestCases
deleted file mode 100644
index 37ab598..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSmsCallLogTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSmsCallLogTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSmsCallLogTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSmsCallLogTestCases',
-        test_name='cheets_GTS_R.GtsSmsCallLogTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSmsCallLogTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSmsCallLogTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSpeechServicesTestCases b/server/site_tests/cheets_GTS_R/control.GtsSpeechServicesTestCases
deleted file mode 100644
index 790b909..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSpeechServicesTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSpeechServicesTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSpeechServicesTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSpeechServicesTestCases',
-        test_name='cheets_GTS_R.GtsSpeechServicesTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSpeechServicesTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSpeechServicesTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSsaidHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsSsaidHostTestCases
deleted file mode 100644
index d28f265..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSsaidHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSsaidHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSsaidHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSsaidHostTestCases',
-        test_name='cheets_GTS_R.GtsSsaidHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSsaidHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSsaidHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsStagedInstallHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsStagedInstallHostTestCases
deleted file mode 100644
index 752939e..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsStagedInstallHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsStagedInstallHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsStagedInstallHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsStagedInstallHostTestCases',
-        test_name='cheets_GTS_R.GtsStagedInstallHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStagedInstallHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsStagedInstallHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsStatsdHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsStatsdHostTestCases
deleted file mode 100644
index d7f7824..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsStatsdHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsStatsdHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsStatsdHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsStatsdHostTestCases',
-        test_name='cheets_GTS_R.GtsStatsdHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStatsdHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsStatsdHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsStorageTestCases b/server/site_tests/cheets_GTS_R/control.GtsStorageTestCases
deleted file mode 100644
index 0f8fb9f..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsStorageTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsStorageTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsStorageTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsStorageTestCases',
-        test_name='cheets_GTS_R.GtsStorageTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStorageTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsStorageTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSupervisionTestCases b/server/site_tests/cheets_GTS_R/control.GtsSupervisionTestCases
deleted file mode 100644
index f46929e..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSupervisionTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSupervisionTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSupervisionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSupervisionTestCases',
-        test_name='cheets_GTS_R.GtsSupervisionTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSupervisionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSupervisionTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSuspendAppsPermissionTestCases b/server/site_tests/cheets_GTS_R/control.GtsSuspendAppsPermissionTestCases
deleted file mode 100644
index 061cfc4..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSuspendAppsPermissionTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSuspendAppsPermissionTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSuspendAppsPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSuspendAppsPermissionTestCases',
-        test_name='cheets_GTS_R.GtsSuspendAppsPermissionTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSuspendAppsPermissionTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSuspendAppsPermissionTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsSuspendAppsTestCases b/server/site_tests/cheets_GTS_R/control.GtsSuspendAppsTestCases
deleted file mode 100644
index 882d1f8..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsSuspendAppsTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsSuspendAppsTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSuspendAppsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsSuspendAppsTestCases',
-        test_name='cheets_GTS_R.GtsSuspendAppsTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSuspendAppsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSuspendAppsTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsTelecomManagerTests b/server/site_tests/cheets_GTS_R/control.GtsTelecomManagerTests
deleted file mode 100644
index 737cfbc..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsTelecomManagerTests
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsTelecomManagerTests'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTelecomManagerTests of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTelecomManagerTests',
-        test_name='cheets_GTS_R.GtsTelecomManagerTests',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTelecomManagerTests', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTelecomManagerTests',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsTelephonyNumberVerificationHostCases b/server/site_tests/cheets_GTS_R/control.GtsTelephonyNumberVerificationHostCases
deleted file mode 100644
index 4b2f565..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsTelephonyNumberVerificationHostCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsTelephonyNumberVerificationHostCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTelephonyNumberVerificationHostCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTelephonyNumberVerificationHostCases',
-        test_name='cheets_GTS_R.GtsTelephonyNumberVerificationHostCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTelephonyNumberVerificationHostCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTelephonyNumberVerificationHostCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsTelephonyTestCases b/server/site_tests/cheets_GTS_R/control.GtsTelephonyTestCases
deleted file mode 100644
index 12f3c7c..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsTelephonyTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsTelephonyTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTelephonyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTelephonyTestCases',
-        test_name='cheets_GTS_R.GtsTelephonyTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTelephonyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTelephonyTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsTestHarnessModeTestCases b/server/site_tests/cheets_GTS_R/control.GtsTestHarnessModeTestCases
deleted file mode 100644
index 1556c46..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsTestHarnessModeTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsTestHarnessModeTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTestHarnessModeTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTestHarnessModeTestCases',
-        test_name='cheets_GTS_R.GtsTestHarnessModeTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTestHarnessModeTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTestHarnessModeTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsTetheringTestCases b/server/site_tests/cheets_GTS_R/control.GtsTetheringTestCases
deleted file mode 100644
index c4af1c5..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsTetheringTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsTetheringTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTetheringTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTetheringTestCases',
-        test_name='cheets_GTS_R.GtsTetheringTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTetheringTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTetheringTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsTvBugReportTestCases b/server/site_tests/cheets_GTS_R/control.GtsTvBugReportTestCases
deleted file mode 100644
index a1277d3..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsTvBugReportTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsTvBugReportTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTvBugReportTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTvBugReportTestCases',
-        test_name='cheets_GTS_R.GtsTvBugReportTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTvBugReportTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTvBugReportTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsTvHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsTvHostTestCases
deleted file mode 100644
index a407c97..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsTvHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsTvHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTvHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTvHostTestCases',
-        test_name='cheets_GTS_R.GtsTvHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTvHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTvHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsTvTestCases b/server/site_tests/cheets_GTS_R/control.GtsTvTestCases
deleted file mode 100644
index 8df35f4..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsTvTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsTvTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsTvTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsTvTestCases',
-        test_name='cheets_GTS_R.GtsTvTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTvTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsTvTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsUnofficialApisUsageTestCases b/server/site_tests/cheets_GTS_R/control.GtsUnofficialApisUsageTestCases
deleted file mode 100644
index cb18bfe..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsUnofficialApisUsageTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsUnofficialApisUsageTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsUnofficialApisUsageTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsUnofficialApisUsageTestCases',
-        test_name='cheets_GTS_R.GtsUnofficialApisUsageTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUnofficialApisUsageTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsUnofficialApisUsageTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsUsageStatsTestCases b/server/site_tests/cheets_GTS_R/control.GtsUsageStatsTestCases
deleted file mode 100644
index 4d3ccd4..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsUsageStatsTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsUsageStatsTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsUsageStatsTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsUsageStatsTestCases',
-        test_name='cheets_GTS_R.GtsUsageStatsTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUsageStatsTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsUsageStatsTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsUserspaceRebootHostSideTestCases b/server/site_tests/cheets_GTS_R/control.GtsUserspaceRebootHostSideTestCases
deleted file mode 100644
index 70bd3aa..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsUserspaceRebootHostSideTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsUserspaceRebootHostSideTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsUserspaceRebootHostSideTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsUserspaceRebootHostSideTestCases',
-        test_name='cheets_GTS_R.GtsUserspaceRebootHostSideTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUserspaceRebootHostSideTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsUserspaceRebootHostSideTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsViewTestCases b/server/site_tests/cheets_GTS_R/control.GtsViewTestCases
deleted file mode 100644
index c9464bb..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsViewTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsViewTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsViewTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsViewTestCases',
-        test_name='cheets_GTS_R.GtsViewTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsViewTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsViewTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsVndkDependencyTestCases b/server/site_tests/cheets_GTS_R/control.GtsVndkDependencyTestCases
deleted file mode 100644
index 6754c79..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsVndkDependencyTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsVndkDependencyTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsVndkDependencyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsVndkDependencyTestCases',
-        test_name='cheets_GTS_R.GtsVndkDependencyTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsVndkDependencyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsVndkDependencyTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsWebViewHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsWebViewHostTestCases
deleted file mode 100644
index 5fd0a07..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsWebViewHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsWebViewHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsWebViewHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsWebViewHostTestCases',
-        test_name='cheets_GTS_R.GtsWebViewHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsWebViewHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsWebViewHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsWebViewTestCases b/server/site_tests/cheets_GTS_R/control.GtsWebViewTestCases
deleted file mode 100644
index f6c8262..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsWebViewTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsWebViewTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsWebViewTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsWebViewTestCases',
-        test_name='cheets_GTS_R.GtsWebViewTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsWebViewTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsWebViewTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsWellbeingHostTestCases b/server/site_tests/cheets_GTS_R/control.GtsWellbeingHostTestCases
deleted file mode 100644
index bf3350f..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsWellbeingHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsWellbeingHostTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsWellbeingHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsWellbeingHostTestCases',
-        test_name='cheets_GTS_R.GtsWellbeingHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsWellbeingHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsWellbeingHostTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsWellbeingPermissionPolicyTestCases b/server/site_tests/cheets_GTS_R/control.GtsWellbeingPermissionPolicyTestCases
deleted file mode 100644
index cab0b5d..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsWellbeingPermissionPolicyTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsWellbeingPermissionPolicyTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsWellbeingPermissionPolicyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsWellbeingPermissionPolicyTestCases',
-        test_name='cheets_GTS_R.GtsWellbeingPermissionPolicyTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsWellbeingPermissionPolicyTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsWellbeingPermissionPolicyTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsWellbeingTestCases b/server/site_tests/cheets_GTS_R/control.GtsWellbeingTestCases
deleted file mode 100644
index 6c0104d..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsWellbeingTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsWellbeingTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsWellbeingTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsWellbeingTestCases',
-        test_name='cheets_GTS_R.GtsWellbeingTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsWellbeingTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsWellbeingTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsYouTubeTestCases b/server/site_tests/cheets_GTS_R/control.GtsYouTubeTestCases
deleted file mode 100644
index 642aa96..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsYouTubeTestCases
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsYouTubeTestCases'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsYouTubeTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=5,
-        needs_push_media=True,
-        tag='GtsYouTubeTestCases',
-        test_name='cheets_GTS_R.GtsYouTubeTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsYouTubeTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsYouTubeTestCases',
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.arm.GtsMediaTestCases.32 b/server/site_tests/cheets_GTS_R/control.arm.GtsMediaTestCases.32
deleted file mode 100644
index 5f0e84e..0000000
--- a/server/site_tests/cheets_GTS_R/control.arm.GtsMediaTestCases.32
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.arm.GtsMediaTestCases.32'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-PRIORITY = 50
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) using arm ABI in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=5,
-        tag='arm.GtsMediaTestCases.32',
-        test_name='cheets_GTS_R.arm.GtsMediaTestCases.32',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure', '--abi', 'armeabi-v7a'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMediaTestCases',
-        target_plan=None,
-        bundle='arm',
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=36000)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.arm.GtsMediaTestCases.64 b/server/site_tests/cheets_GTS_R/control.arm.GtsMediaTestCases.64
deleted file mode 100644
index 04aa3d5..0000000
--- a/server/site_tests/cheets_GTS_R/control.arm.GtsMediaTestCases.64
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.arm.GtsMediaTestCases.64'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-PRIORITY = 50
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) using arm ABI in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=5,
-        tag='arm.GtsMediaTestCases.64',
-        test_name='cheets_GTS_R.arm.GtsMediaTestCases.64',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure', '--abi', 'arm64-v8a'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMediaTestCases',
-        target_plan=None,
-        bundle='arm',
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=36000)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.tradefed-run-collect-tests-only b/server/site_tests/cheets_GTS_R/control.tradefed-run-collect-tests-only
deleted file mode 100644
index 3e51dfa..0000000
--- a/server/site_tests/cheets_GTS_R/control.tradefed-run-collect-tests-only
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.tradefed-run-collect-tests-only'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-PRIORITY = 70
-DOC = 'Run all of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=0,
-        tag='tradefed-run-collect-tests-only',
-        test_name='cheets_GTS_R.tradefed-run-collect-tests-only',
-        run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'GtsYouTubeTestCases:skip-media-download:true'],
-        retry_template=None,
-        target_module=None,
-        target_plan=None,
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=1800)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.tradefed-run-test b/server/site_tests/cheets_GTS_R/control.tradefed-run-test
deleted file mode 100644
index 4046401..0000000
--- a/server/site_tests/cheets_GTS_R/control.tradefed-run-test
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file is not auto-generated. Don't delete it.
-
-# Boring.
-import logging
-import pprint
-from autotest_lib.client.bin import utils
-
-usage = """
-1) To run agains a particular $DUT use
-   test_that --args="module=GtsMediaTestCases test=com.google.android.media.gts.MediaCodecStressTest#testDecodeDecodeCompositeDisplay1080p" $DUT cheets_GTS_R.tradefed-run-test
-
-2) To run against a lab pool use
-    run_suite.py --board=eve --build=$TRYJOB_BUILD --suite_name arc-gts-test --pool cts --no_wait True --priority CQ --timeout_mins 6160 --retry False --num 1 --suite_min_duts 1 --test_args="{'module' : 'GtsMediaTestCases', 'test' : 'com.google.android.media.gts.MediaCodecStressTest#testDecodeDecodeCompositeDisplay1080p'}"
-"""
-
-def usage_error():
-    logging.info('Example usage:')
-    logging.info(usage)
-    raise SystemExit
-
-pp = pprint.PrettyPrinter()
-logging.info(
-    '***********************************************************************')
-
-# Define the variables that we are going to use and set sensible defaults.
-gts_module = ''
-gts_retry = 5
-gts_revision = None
-gts_test = ''
-gts_timeout = 3600
-
-# Pull parameters either from run_suite or test_that.
-if 'args_dict' in vars():
-    logging.info('Raw test options from run_suite:')
-    pp.pprint(args_dict)
-elif args:
-    logging.info('Raw test options from test_that:')
-    pp.pprint(args)
-    args_dict = utils.args_to_dict(args)
-else:
-    usage_error()
-
-gts_module = args_dict.get('module', gts_module)
-gts_revision = args_dict.get('revision', gts_revision)
-gts_test = args_dict.get('test', gts_test)
-gts_timeout = float(args_dict.get('timeout', gts_timeout))
-gts_retry = int(args_dict.get('max_retry', gts_retry))
-
-# Basic checks for option validity.
-logging.error('Running module %s with test %s on revision %s',
-              gts_module, gts_test, gts_revision)
-if not gts_module or not gts_test:
-    usage_error()
-
-# And we are getting ready for tradefed.
-uri = ('gs://chromeos-arc-images/cts/bundle/android-gts-' + gts_revision +
-       '.zip') if gts_revision else 'LATEST'
-run_template = ['run', 'commandAndExit', 'gts',
-                '--include-filter', gts_module + ' ' + gts_test,
-                '--skip-device-info',
-                '--ignore-business-logic-failure']
-retry_template = ['run', 'commandAndExit', 'retry',
-                  '--retry', '{session_id}']
-# Unfortunately super long test names can cause problems. Try to get the
-# rightmost element and use that as a simplified name.
-# TODO(ihf): fix pipeline so it works with super long names.
-simplified_test = gts_test
-if '#' in gts_test:
-    simplified_test = gts_test.split('#')[-1]
-elif '.' in gts_test:
-    simplified_test = gts_test.split('.')[-1]
-tag = 'tradefed-run-test.%s.%s' % (gts_module, simplified_test)
-
-# The usual testing stanza. We are suppressing some DEPENDENCIES on purpose.
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.tradefed-run-test'
-ATTRIBUTES = ''
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 0
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 256000
-DOC = ('Run a test of the Android Google Test Suite (GTS) in the ARC++ '
-       'container.')
-
-# And launch.
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=gts_retry,
-        needs_push_media=True,
-        tag=tag,
-        test_name=NAME,
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=run_template,
-        retry_template=retry_template,
-        target_module=None,
-        target_plan=None,
-        uri=uri,
-        load_waivers=('#' not in gts_test),  # No waivers for single-test runs
-        login_precondition_commands=[
-            'lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'
-        ],
-        timeout=gts_timeout)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.x86.GtsMediaTestCases.32 b/server/site_tests/cheets_GTS_R/control.x86.GtsMediaTestCases.32
deleted file mode 100644
index 00b20b6..0000000
--- a/server/site_tests/cheets_GTS_R/control.x86.GtsMediaTestCases.32
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.x86.GtsMediaTestCases.32'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-PRIORITY = 50
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) using x86 ABI in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=5,
-        tag='x86.GtsMediaTestCases.32',
-        test_name='cheets_GTS_R.x86.GtsMediaTestCases.32',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure', '--abi', 'x86'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMediaTestCases',
-        target_plan=None,
-        bundle='x86',
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=36000)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.x86.GtsMediaTestCases.64 b/server/site_tests/cheets_GTS_R/control.x86.GtsMediaTestCases.64
deleted file mode 100644
index eb748f9..0000000
--- a/server/site_tests/cheets_GTS_R/control.x86.GtsMediaTestCases.64
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.x86.GtsMediaTestCases.64'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-PRIORITY = 50
-DOC = 'Run module GtsMediaTestCases of the Android Google Test Suite (GTS) using x86 ABI in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS_R',
-        hosts=host_list,
-        iterations=1,
-        max_retry=5,
-        tag='x86.GtsMediaTestCases.64',
-        test_name='cheets_GTS_R.x86.GtsMediaTestCases.64',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure', '--abi', 'x86_64'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsMediaTestCases',
-        target_plan=None,
-        bundle='x86',
-        retry_manual_tests=True,
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=36000)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/generate_controlfiles.py b/server/site_tests/cheets_GTS_R/generate_controlfiles.py
deleted file mode 100755
index 0f18408..0000000
--- a/server/site_tests/cheets_GTS_R/generate_controlfiles.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python2
-# Copyright 2019 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This is a trampoline script to invoke the actual generator script.
-
-import os
-import sys
-
-target_script_name = 'generate_controlfiles_GTS_R.py'
-target_script_path = os.path.abspath(os.path.join(os.path.dirname(__file__),
-    '..', '..', 'cros', 'tradefed', target_script_name))
-os.execv(target_script_path, sys.argv)
diff --git a/server/site_tests/cheets_GTS_R/notest_modules/notest_combined_modules.yaml b/server/site_tests/cheets_GTS_R/notest_modules/notest_combined_modules.yaml
deleted file mode 100644
index fc3917d..0000000
--- a/server/site_tests/cheets_GTS_R/notest_modules/notest_combined_modules.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-GtsIncrementalInstall: [all]
-GtsInstallerV2: [all]
-GtsMemory: [all]
-GtsNoPermission: [all]
-GtsSample: [all]
diff --git a/server/site_tests/cheets_GTS_R/notest_modules/notest_modules.yaml b/server/site_tests/cheets_GTS_R/notest_modules/notest_modules.yaml
deleted file mode 100644
index cf5eaf9..0000000
--- a/server/site_tests/cheets_GTS_R/notest_modules/notest_modules.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-GtsAccountsHostTestCases: [all]
-GtsAssistantHostTestCases: [all]
-GtsAssistantWorkProfileHostTestCases: [all]
-GtsBootHealthHostTestCases: [all]
-GtsDebugfsMountTestCases: [shipatN, shipatP]
-GtsDexModuleRegistrationTestCases: [all]
-GtsDevicePolicyTestCases: [all]
-GtsDozeHostSideTestCases: [all]
-GtsFontHostTestCases: [all]
-GtsGameOverlayTestCases: [all]
-GtsGraphicsHostTestCases: [no_vulkan]
-GtsIncidentConfirmationTestCases: [all]
-GtsIncrementalInstallProxyHostTestCases: [all]
-GtsIncrementalInstallTestCases: [all]
-GtsIncrementalInstallTestCases_BackgroundProcess: [all]
-GtsIncrementalInstallTriggerApp: [all]
-GtsIncrementalInstallTriggerApp_BackgroundProcess: [all]
-GtsInstallerV2TestCases: [all]
-GtsInstallerV2TestCases_BackgroundProcess: [all]
-GtsKidsHomeHostTestCases: [all]
-GtsLensTestCases: [all]
-GtsMemoryHostTestCases: [all]
-GtsMemoryTestCases: [all]
-GtsModuleMetadataTestCases: [all]
-GtsNoPermissionTestCases: [all]
-GtsNoPermissionTestCases25: [all]
-GtsOemLockServiceTestCases: [all]
-GtsPackageInstallerTapjackingTestCases: [all]
-GtsPackageRoleEnforcementTests: [all]
-GtsPackageUninstallTestCases: [all]
-GtsSampleDeviceTestCases: [all]
-GtsSampleDynamicConfigTestCases: [all]
-GtsSampleHostTestCases: [all]
-GtsSmartBatteryDeviceTestCases: [all]
-GtsStagedInstallHostTestCases: [all]
-GtsStorageTestCases: [all]
-GtsSuspendAppsTestCases: [all]
-GtsTestHarnessModeTestCases: [all]
-GtsTvTestCases: [all]
-GtsUsageStatsTestCases: [all]
-GtsUserspaceRebootHostSideTestCases: [all]
-GtsWebViewHostTestCases: [all]
-GtsWellbeingHostTestCases: [all]
-GtsWellbeingTestCases: [all]