diff --git a/server/cros/tradefed/generate_controlfiles_GTS_R.py b/server/cros/tradefed/generate_controlfiles_GTS_R.py
index 3dc4b70..94e6983 100755
--- a/server/cros/tradefed/generate_controlfiles_GTS_R.py
+++ b/server/cros/tradefed/generate_controlfiles_GTS_R.py
@@ -32,6 +32,7 @@
 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
diff --git a/server/cros/tradefed/generate_controlfiles_common.py b/server/cros/tradefed/generate_controlfiles_common.py
index 8eba3f4..986121f 100755
--- a/server/cros/tradefed/generate_controlfiles_common.py
+++ b/server/cros/tradefed/generate_controlfiles_common.py
@@ -895,24 +895,40 @@
     Notice that the parsing gets broken at times with major new CTS drops.
     """
     tradefed = os.path.join(path, CONFIG['TRADEFED_EXECUTABLE_PATH'])
-    # Forgive me for I have sinned. Same as: chmod +x tradefed.
+    # Python's zipfle module does not set the executable bit.
+    # tradefed and java command need chmod +x.
     os.chmod(tradefed, os.stat(tradefed).st_mode | stat.S_IEXEC)
+    java = CONFIG.get('JAVA_EXECUTABLE_PATH', None)
+    if java:
+        java = os.path.join(path, java)
+        os.chmod(java, os.stat(java).st_mode | stat.S_IEXEC)
     cmd_list = [tradefed, 'list', 'modules']
     logging.info('Calling tradefed for list of modules.')
     with open(os.devnull, 'w') as devnull:
         # tradefed terminates itself if stdin is not a tty.
         tradefed_output = subprocess.check_output(cmd_list, stdin=devnull)
 
-    # TODO(ihf): Get a tradefed command which terminates then refactor.
-    p = subprocess.Popen(cmd_list, stdout=subprocess.PIPE)
+    _ABI_PREFIXES = ('arm', 'x86')
+    _MODULE_PREFIXES = ('Cts', 'cts-', 'signed-Cts', 'vm-tests-tf', 'Sts')
+
+    # Some CTS/GTS versions insert extra linebreaks due to a bug b/196912758.
+    # Below is a heurestical workaround for the situation.
+    lines = []
+    prev_line_abi_prefixed = False
+    for line in tradefed_output.splitlines():
+        abi_prefixed = line.startswith(_ABI_PREFIXES)
+        end_of_modules = (len(line) == 0 or 'Saved log to' in line)
+        if prev_line_abi_prefixed and not end_of_modules and not abi_prefixed:
+            # Merge a line immediately following 'abi XtsModuleName'
+            lines[-1] += line
+        else:
+            lines.append(line)
+        prev_line_abi_prefixed = abi_prefixed
+
     modules = set()
     build = '<unknown>'
-    line = ''
     revision = None
-    is_in_intaractive_mode = True
-    # The process does not terminate, but we know the last test is vm-tests-tf.
-    while True:
-        line = p.stdout.readline().strip()
+    for line in lines:
         # Android Compatibility Test Suite 7.0 (3423912)
         if (line.startswith('Android Compatibility Test Suite ')
                     or line.startswith('Android Google ')
@@ -921,47 +937,18 @@
             logging.info('Unpacking: %s.', line)
             build = get_tradefed_build(line)
             revision = get_tradefed_revision(line)
-        elif line.startswith('Non-interactive mode: '):
-            is_in_intaractive_mode = False
-        elif line.startswith('arm') or line.startswith('x86'):
+        elif line.startswith(_ABI_PREFIXES):
             # Newer CTS shows ABI-module pairs like "arm64-v8a CtsNetTestCases"
             line = line.split()[1]
             if line not in CONFIG.get('EXCLUDE_MODULES', []):
                 modules.add(line)
-        elif line.startswith('Cts'):
+        elif line.startswith(_MODULE_PREFIXES):
+            # Old CTS plainly lists up the module name
             modules.add(line)
-        elif line.startswith('Gts'):
-            # Older GTS plainly lists the module names
-            modules.add(line)
-        elif line.startswith('Sts'):
-            modules.add(line)
-        elif line.startswith('cts-'):
-            modules.add(line)
-        elif line.startswith('signed-Cts'):
-            modules.add(line)
-        elif line.startswith('vm-tests-tf'):
-            modules.add(line)
-            break  # TODO(ihf): Fix using this as EOS.
-        elif not line:
-            exit_code = p.poll()
-            if exit_code is not None:
-                # The process has automatically exited.
-                if is_in_intaractive_mode or exit_code != 0:
-                    # The process exited unexpectedly in interactive mode,
-                    # or exited with error in non-interactive mode.
-                    logging.warning(
-                        'The process has exited unexpectedly (exit code: %d)',
-                        exit_code)
-                    modules = set()
-                break
         elif line.isspace() or line.startswith('Use "help"'):
             pass
         else:
             logging.warning('Ignoring "%s"', line)
-    if p.poll() is None:
-        # Kill the process if alive.
-        p.kill()
-    p.wait()
 
     if not modules:
         raise Exception("no modules found.")
diff --git a/server/site_tests/cheets_GTS_R/cheets_GTS_R.py b/server/site_tests/cheets_GTS_R/cheets_GTS_R.py
index 077e1c6..b6f35ce 100644
--- a/server/site_tests/cheets_GTS_R/cheets_GTS_R.py
+++ b/server/site_tests/cheets_GTS_R/cheets_GTS_R.py
@@ -24,14 +24,14 @@
 _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 + 'gts-8-R4-R-7380330.zip'
+_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-8-R4-R-7380330.zip'
+_GTS_LATEST_URI = 'gs://chromeos-arc-images/cts/bundle/android-gts-9-R1-R-7679548.zip'
 
 
 class cheets_GTS_R(tradefed_test.TradefedTest):
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDeviceConfigTestCases b/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDeviceConfigTestCases
deleted file mode 100644
index 719b7a0..0000000
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDeviceConfigTestCases
+++ /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.8.0_r4.GtsDeviceConfigTestCases'
-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 of the 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='8.0_r4.GtsDeviceConfigTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsDeviceConfigTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        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,
-        uri='LATEST',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsInstallerV2 b/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsInstallerV2
deleted file mode 100644
index d592f4e..0000000
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsInstallerV2
+++ /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.8.0_r4.GtsInstallerV2'
-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 GtsInstallerV2TestCases, GtsInstallerV2TestCases_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='8.0_r4.GtsInstallerV2',
-        test_name='cheets_GTS_R.8.0_r4.GtsInstallerV2',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsInstallerV2TestCases', '--include-filter', 'GtsInstallerV2TestCases_BackgroundProcess', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallerV2',
-        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.8.0_r4.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases b/server/site_tests/cheets_GTS_R/control.8.0_r4.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases
deleted file mode 100644
index 216e3e7..0000000
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.all.GtsAccountsHostTestCases_-_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.8.0_r4.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases'
-ATTRIBUTES = 'suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAccountsHostTestCases, GtsAdminTestCases, GtsAfwTestCases, GtsAndroidAutoDeviceTestCases, GtsAppBlacklistDeviceTestCases, GtsAppTestCases, GtsAppVisibilityDeviceTestCases, GtsArtManagerHostTestCases, GtsAssistIntentTestCases, GtsAssistantHostTestCases, GtsAssistantMicHostTestCases, GtsAssistantWorkProfileHostTestCases, GtsAudioTestCases, GtsBackupHostTestCases, GtsBackupTestCases, GtsBootHealthHostTestCases, GtsBootStatsTestCases, GtsCNGCoreTestCases, GtsCallLogTestCases, GtsCameraTestCases, GtsCastHostTestCases, GtsContactsAppDeviceTestCases, GtsContactsTest, GtsContentHostTestCases, GtsContentTestCases, GtsContextHubPermissionDeviceTestCases, GtsDebugfsMountTestCases, GtsDeviceConfigTestCases, 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='8.0_r4.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--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', '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', '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.GtsAccountsHostTestCases_-_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.8.0_r4.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases b/server/site_tests/cheets_GTS_R/control.8.0_r4.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases
deleted file mode 100644
index 0e6e080..0000000
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases
+++ /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.8.0_r4.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, GtsGmscoreHostTestCases, GtsGraphicsHostTestCases, GtsHomeHostTestCases, GtsIncidentConfirmationTestCases, GtsIncidentManagerTestCases, GtsIncrementalInstallProxyHostTestCases, GtsIncrementalInstallTestCases, GtsIncrementalInstallTestCases_BackgroundProcess, GtsIncrementalInstallTriggerApp, GtsIncrementalInstallTriggerApp_BackgroundProcess, GtsInstallPackagesWhitelistDeviceTestCases, GtsInstallerV2TestCases, GtsInstallerV2TestCases_BackgroundProcess, 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='8.0_r4.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases',
-        test_name='cheets_GTS_R.8.0_r4.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', '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', 'GtsIncrementalInstallTriggerApp', '--include-filter', 'GtsIncrementalInstallTriggerApp_BackgroundProcess', '--include-filter', 'GtsInstallPackagesWhitelistDeviceTestCases', '--include-filter', 'GtsInstallerV2TestCases', '--include-filter', 'GtsInstallerV2TestCases_BackgroundProcess', '--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',
-        prerequisites=['bluetooth'],
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases b/server/site_tests/cheets_GTS_R/control.8.0_r4.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases
deleted file mode 100644
index 4a1e823..0000000
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.all.GtsMemoryHostTestCases_-_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.8.0_r4.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, 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, 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='8.0_r4.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases',
-        test_name='cheets_GTS_R.8.0_r4.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', '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', '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',
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsWebView b/server/site_tests/cheets_GTS_R/control.9.0_r1.CtsEdiHost
similarity index 67%
copy from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsWebView
copy to server/site_tests/cheets_GTS_R/control.9.0_r1.CtsEdiHost
index 05b4d7a..7f559f9 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsWebView
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.CtsEdiHost
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsWebView'
+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 GtsWebViewHostTestCases, GtsWebViewTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -20,12 +20,12 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsWebView',
-        test_name='cheets_GTS_R.8.0_r4.GtsWebView',
+        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', 'GtsWebViewHostTestCases', '--include-filter', 'GtsWebViewTestCases', '--ignore-business-logic-failure'],
+        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='GtsWebView',
+        target_module='CtsEdiHost',
         target_plan=None,
         uri='LATEST',
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAccountsHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAccountsHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAccountsHostTestCases
index 4441e75..58518e6 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAccountsHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAccountsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsAccountsHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsAccountsHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsAccountsHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsAccountsHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAdminTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAdminTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAdminTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAdminTestCases
index 229afe7..73f7dbb 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAdminTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAdminTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsAdminTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsAdminTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsAdminTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsAdminTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAfwTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAfwTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAfwTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAfwTestCases
index 179d498..f525e8b 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAfwTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAfwTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsAfwTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsAfwTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsAfwTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsAfwTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAndroidAutoDeviceTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAndroidAutoDeviceTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAndroidAutoDeviceTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAndroidAutoDeviceTestCases
index 856c4a6..60eee71 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAndroidAutoDeviceTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAndroidAutoDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsAndroidAutoDeviceTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsAndroidAutoDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsAndroidAutoDeviceTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsAndroidAutoDeviceTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsApp b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsApp
similarity index 91%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsApp
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsApp
index 461aed1..4979a18 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsApp
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsApp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsApp'
+NAME = 'cheets_GTS_R.9.0_r1.GtsApp'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsApp',
-        test_name='cheets_GTS_R.8.0_r4.GtsApp',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsArtManagerHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsArtManagerHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsArtManagerHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsArtManagerHostTestCases
index 1c81b94..7f2caf5 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsArtManagerHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsArtManagerHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsArtManagerHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsArtManagerHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsArtManagerHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsArtManagerHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAssistIntentTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAssistIntentTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAssistIntentTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAssistIntentTestCases
index 63a5552..30ac41f 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAssistIntentTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAssistIntentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsAssistIntentTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsAssistIntentTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsAssistIntentTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsAssistIntentTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAssistant b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAssistant
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAssistant
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAssistant
index c660cab..90d0b46 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAssistant
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAssistant
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsAssistant'
+NAME = 'cheets_GTS_R.9.0_r1.GtsAssistant'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsAssistant',
-        test_name='cheets_GTS_R.8.0_r4.GtsAssistant',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAudioTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAudioTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAudioTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAudioTestCases
index bbc57d9..91cb364 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAudioTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsAudioTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsAudioTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsAudioTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsAudioTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsAudioTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsBackup b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsBackup
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsBackup
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsBackup
index 472ce53..f411ba0 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsBackup
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsBackup
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsBackup'
+NAME = 'cheets_GTS_R.9.0_r1.GtsBackup'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsBackup',
-        test_name='cheets_GTS_R.8.0_r4.GtsBackup',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsBoot b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsBoot
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsBoot
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsBoot
index 63c27f9..e1c0994 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsBoot
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsBoot
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsBoot'
+NAME = 'cheets_GTS_R.9.0_r1.GtsBoot'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsBoot',
-        test_name='cheets_GTS_R.8.0_r4.GtsBoot',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCNGCoreTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCNGCoreTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCNGCoreTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCNGCoreTestCases
index 3bfd722..57a79ca 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCNGCoreTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCNGCoreTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsCNGCoreTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsCNGCoreTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsCNGCoreTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsCNGCoreTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsViewTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCalendarTests
similarity index 74%
copy from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsViewTestCases
copy to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCalendarTests
index 1388b4a..f4ba7fd 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsViewTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCalendarTests
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsViewTestCases'
+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 GtsViewTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -20,12 +20,12 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsViewTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsViewTestCases',
+        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', 'GtsViewTestCases', '--ignore-business-logic-failure'],
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCalendarTests', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsViewTestCases',
+        target_module='GtsCalendarTests',
         target_plan=None,
         uri='LATEST',
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCallLogTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCallLogTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCallLogTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCallLogTestCases
index 0b82972..e38efc5 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCallLogTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCallLogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsCallLogTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsCallLogTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsCallLogTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsCallLogTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCameraTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCameraTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCameraTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCameraTestCases
index 84ebf1b..4048da9 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCameraTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCameraTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsCameraTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsCameraTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsCameraTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsCameraTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCastHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCastHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCastHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCastHostTestCases
index f4aba2e..e2c7062 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCastHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsCastHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsCastHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsCastHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsCastHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsCastHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsContacts b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContacts
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsContacts
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContacts
index 08ef82a..de25865 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsContacts
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContacts
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsContacts'
+NAME = 'cheets_GTS_R.9.0_r1.GtsContacts'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsContacts',
-        test_name='cheets_GTS_R.8.0_r4.GtsContacts',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsContent b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContent
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsContent
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContent
index 013bc5b..bff22d6 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsContent
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContent
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsContent'
+NAME = 'cheets_GTS_R.9.0_r1.GtsContent'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsContent',
-        test_name='cheets_GTS_R.8.0_r4.GtsContent',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsContextHubPermissionDeviceTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContextHubPermissionDeviceTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsContextHubPermissionDeviceTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContextHubPermissionDeviceTestCases
index 9377668..b7dc2b6 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsContextHubPermissionDeviceTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsContextHubPermissionDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsContextHubPermissionDeviceTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsContextHubPermissionDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsContextHubPermissionDeviceTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsContextHubPermissionDeviceTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDebugfsMountTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDebugfsMountTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDebugfsMountTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDebugfsMountTestCases
index 3bd85b6..13ad947 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDebugfsMountTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDebugfsMountTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsDebugfsMountTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsDebugfsMountTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsDebugfsMountTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsDebugfsMountTestCases',
+        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}'],
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
new file mode 100644
index 0000000..18c962d
--- /dev/null
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDevice
@@ -0,0 +1,34 @@
+# 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.8.0_r4.GtsDexModuleRegistrationTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDexModuleRegistrationTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDexModuleRegistrationTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDexModuleRegistrationTestCases
index a628b96..3eedda0 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDexModuleRegistrationTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDexModuleRegistrationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsDexModuleRegistrationTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsDexModuleRegistrationTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsDexModuleRegistrationTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsDexModuleRegistrationTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDialer b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDialer
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDialer
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDialer
index 4c9885a..bc7a272 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDialer
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDialer
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsDialer'
+NAME = 'cheets_GTS_R.9.0_r1.GtsDialer'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsDialer',
-        test_name='cheets_GTS_R.8.0_r4.GtsDialer',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDoze b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDoze
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDoze
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDoze
index 31620e3..0da3df1 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDoze
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDoze
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsDoze'
+NAME = 'cheets_GTS_R.9.0_r1.GtsDoze'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsDoze',
-        test_name='cheets_GTS_R.8.0_r4.GtsDoze',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDuoReadyTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDuoReadyTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDuoReadyTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDuoReadyTestCases
index 54371ba..65af6da 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsDuoReadyTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsDuoReadyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsDuoReadyTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsDuoReadyTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsDuoReadyTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsDuoReadyTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsEdiHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsEdiHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsEdiHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsEdiHostTestCases
index cd3caba..b773748 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsEdiHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsEdiHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsEdiHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsEdiHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsEdiHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsEdiHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsExoPlayerTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsExoPlayerTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsExoPlayerTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsExoPlayerTestCases
index e9eb0bb..ac504b2 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsExoPlayerTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsExoPlayerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsExoPlayerTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsExoPlayerTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsExoPlayerTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsExoPlayerTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsFeaturesTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFeaturesTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsFeaturesTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFeaturesTestCases
index 0858657..cfcc5fb 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsFeaturesTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFeaturesTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsFeaturesTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsFeaturesTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsFeaturesTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsFeaturesTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFilesByGoogleTestCases
similarity index 69%
copy from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAccountsHostTestCases
copy to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFilesByGoogleTestCases
index 4441e75..a67bb7e 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsAccountsHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFilesByGoogleTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsAccountsHostTestCases'
+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 GtsAccountsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -20,12 +20,12 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsAccountsHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsAccountsHostTestCases',
+        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', 'GtsAccountsHostTestCases', '--ignore-business-logic-failure'],
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFilesByGoogleTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAccountsHostTestCases',
+        target_module='GtsFilesByGoogleTestCases',
         target_plan=None,
         uri='LATEST',
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCastHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFontHostTestCases
similarity index 74%
copy from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCastHostTestCases
copy to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFontHostTestCases
index f4aba2e..907dd16 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsCastHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsFontHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsCastHostTestCases'
+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 GtsCastHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -20,12 +20,12 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsCastHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsCastHostTestCases',
+        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', 'GtsCastHostTestCases', '--ignore-business-logic-failure'],
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFontHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsCastHostTestCases',
+        target_module='GtsFontHostTestCases',
         target_plan=None,
         uri='LATEST',
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSupervisionTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGameOverlayTestCases
similarity index 73%
copy from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSupervisionTestCases
copy to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGameOverlayTestCases
index 2c627a5..acf21c8 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSupervisionTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGameOverlayTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsSupervisionTestCases'
+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 GtsSupervisionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -20,12 +20,12 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSupervisionTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsSupervisionTestCases',
+        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', 'GtsSupervisionTestCases', '--ignore-business-logic-failure'],
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameOverlayTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSupervisionTestCases',
+        target_module='GtsGameOverlayTestCases',
         target_plan=None,
         uri='LATEST',
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsGmscoreHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGmscoreHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsGmscoreHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGmscoreHostTestCases
index 61417a8..44bf44e 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsGmscoreHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGmscoreHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsGmscoreHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsGmscoreHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsGmscoreHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsGmscoreHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsGraphicsHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGraphicsHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsGraphicsHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGraphicsHostTestCases
index 9cefa63..e78139d 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsGraphicsHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsGraphicsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsGraphicsHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsGraphicsHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsGraphicsHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsGraphicsHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsHomeHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsHomeHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsHomeHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsHomeHostTestCases
index 9dde7c6..85bd332 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsHomeHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsHomeHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsHomeHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsHomeHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsHomeHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsHomeHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsIncident b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsIncident
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsIncident
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsIncident
index 293c25c..b3665da 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsIncident
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsIncident
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsIncident'
+NAME = 'cheets_GTS_R.9.0_r1.GtsIncident'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsIncident',
-        test_name='cheets_GTS_R.8.0_r4.GtsIncident',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsIncrementalInstall b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsIncrementalInstall
similarity index 69%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsIncrementalInstall
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsIncrementalInstall
index b5a26c0..3503249 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsIncrementalInstall
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsIncrementalInstall
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsIncrementalInstall'
+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, GtsIncrementalInstallTriggerApp, GtsIncrementalInstallTriggerApp_BackgroundProcess of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -20,15 +20,15 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsIncrementalInstall',
-        test_name='cheets_GTS_R.8.0_r4.GtsIncrementalInstall',
+        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', '--include-filter', 'GtsIncrementalInstallTriggerApp', '--include-filter', 'GtsIncrementalInstallTriggerApp_BackgroundProcess', '--ignore-business-logic-failure'],
+        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=2160)
+        timeout=1440)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases
index 58d8b5b..f842fd3 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsInstantAppsHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsInstantAppsHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsInstantAppsHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsInstantAppsHostTestCases
index f74eae4..5bbc1e0 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsInstantAppsHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsInstantAppsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsInstantAppsHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsInstantAppsHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsInstantAppsHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsInstantAppsHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsJniUncompressHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsJniUncompressHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsJniUncompressHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsJniUncompressHostTestCases
index 8409e4a..cf172e2 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsJniUncompressHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsJniUncompressHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsJniUncompressHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsJniUncompressHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsJniUncompressHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsJniUncompressHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsKidsHomeHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsKidsHomeHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsKidsHomeHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsKidsHomeHostTestCases
index ac4ff02..b5f06a1 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsKidsHomeHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsKidsHomeHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsKidsHomeHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsKidsHomeHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsKidsHomeHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsKidsHomeHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsLargeApkHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLargeApkHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsLargeApkHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLargeApkHostTestCases
index 0103957..3dce721 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsLargeApkHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLargeApkHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsLargeApkHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsLargeApkHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsLargeApkHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsLargeApkHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsLensTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLensTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsLensTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLensTestCases
index fc6139e..b6f8c68 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsLensTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLensTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsLensTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsLensTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsLensTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsLensTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsLinkerConfig b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLinkerConfig
similarity index 89%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsLinkerConfig
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLinkerConfig
index a1ef3a0..5336993 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsLinkerConfig
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLinkerConfig
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsLinkerConfig'
+NAME = 'cheets_GTS_R.9.0_r1.GtsLinkerConfig'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsLinkerConfig',
-        test_name='cheets_GTS_R.8.0_r4.GtsLinkerConfig',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsLocation b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLocation
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsLocation
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLocation
index 6c2447b..68d53ec 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsLocation
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsLocation
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsLocation'
+NAME = 'cheets_GTS_R.9.0_r1.GtsLocation'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsLocation',
-        test_name='cheets_GTS_R.8.0_r4.GtsLocation',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsMbaPrivilegedPermissionTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMbaPrivilegedPermissionTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsMbaPrivilegedPermissionTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMbaPrivilegedPermissionTestCases
index 9538a24..fe156d7 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsMbaPrivilegedPermissionTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMbaPrivilegedPermissionTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsMbaPrivilegedPermissionTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsMbaPrivilegedPermissionTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsMbaPrivilegedPermissionTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsMbaPrivilegedPermissionTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsMediaTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMediaTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsMediaTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMediaTestCases
index 43a965e..b99951b 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsMediaTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMediaTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsMediaTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsMediaTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsMediaTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsMediaTestCases',
+        tag='9.0_r1.GtsMediaTestCases',
+        test_name='cheets_GTS_R.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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsMemory b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMemory
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsMemory
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMemory
index 449dc9a..837fb92 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsMemory
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsMemory
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsMemory'
+NAME = 'cheets_GTS_R.9.0_r1.GtsMemory'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsMemory',
-        test_name='cheets_GTS_R.8.0_r4.GtsMemory',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsModuleMetadataTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsModuleMetadataTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsModuleMetadataTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsModuleMetadataTestCases
index 7a68f73..9a6fa05 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsModuleMetadataTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsModuleMetadataTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsModuleMetadataTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsModuleMetadataTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsModuleMetadataTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsModuleMetadataTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNet b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNet
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNet
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNet
index 8a7b79f..50bb3fd 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNet
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNet
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsNet'
+NAME = 'cheets_GTS_R.9.0_r1.GtsNet'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsNet',
-        test_name='cheets_GTS_R.8.0_r4.GtsNet',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNetwork b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNetwork
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNetwork
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNetwork
index 6dccf36..39be836 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNetwork
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNetwork
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsNetwork'
+NAME = 'cheets_GTS_R.9.0_r1.GtsNetwork'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsNetwork',
-        test_name='cheets_GTS_R.8.0_r4.GtsNetwork',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNmgiarcTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNmgiarcTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNmgiarcTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNmgiarcTestCases
index de5cd13..3031df3 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNmgiarcTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNmgiarcTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsNmgiarcTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsNmgiarcTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsNmgiarcTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsNmgiarcTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNoPermission b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNoPermission
similarity index 89%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNoPermission
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNoPermission
index fa5fe85..bdf049b 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNoPermission
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNoPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsNoPermission'
+NAME = 'cheets_GTS_R.9.0_r1.GtsNoPermission'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsNoPermission',
-        test_name='cheets_GTS_R.8.0_r4.GtsNoPermission',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNotificationTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNotificationTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNotificationTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNotificationTestCases
index a5b11e0..34efeb5 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsNotificationTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsNotificationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsNotificationTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsNotificationTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsNotificationTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsNotificationTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsOemLockServiceTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsOemLockServiceTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsOemLockServiceTestCases
index 7d28771..8a4f0e4 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsOemLockServiceTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsOemLockServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsOemLockServiceTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsOemLockServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsOemLockServiceTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsOemLockServiceTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsOsTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsOsTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsOsTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsOsTestCases
index 5145c8e..8fae83f 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsOsTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsOsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsOsTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsOsTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsOsTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsOsTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPackage b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPackage
similarity index 72%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPackage
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPackage
index d6c4cd8..461c872 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPackage
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPackage
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsPackage'
+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, GtsPackageUninstallTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -20,15 +20,15 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPackage',
-        test_name='cheets_GTS_R.8.0_r4.GtsPackage',
+        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', 'GtsPackageUninstallTestCases', '--ignore-business-logic-failure'],
+        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=2160)
+        timeout=2520)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPartnerBookmarksTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPartnerBookmarksTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPartnerBookmarksTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPartnerBookmarksTestCases
index 05d3bb4..eadea23 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPartnerBookmarksTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPartnerBookmarksTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsPartnerBookmarksTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsPartnerBookmarksTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPartnerBookmarksTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsPartnerBookmarksTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPermission b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPermission
similarity index 89%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPermission
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPermission
index d3508ba..8117b3c 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPermission
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsPermission'
+NAME = 'cheets_GTS_R.9.0_r1.GtsPermission'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPermission',
-        test_name='cheets_GTS_R.8.0_r4.GtsPermission',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPlacementTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPlacementTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPlacementTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPlacementTestCases
index 1f3a988..a7e5360 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPlacementTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPlacementTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsPlacementTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsPlacementTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPlacementTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsPlacementTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPlay b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPlay
similarity index 91%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPlay
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPlay
index 079cf18..d2e6c7c 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPlay
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPlay
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsPlay'
+NAME = 'cheets_GTS_R.9.0_r1.GtsPlay'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPlay',
-        test_name='cheets_GTS_R.8.0_r4.GtsPlay',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPrintTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPrintTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPrintTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPrintTestCases
index 7486085..b45ddae 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPrintTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPrintTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsPrintTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsPrintTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPrintTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsPrintTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPrivacyTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPrivacyTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPrivacyTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPrivacyTestCases
index c1c13af..8714e2e 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPrivacyTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPrivacyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsPrivacyTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsPrivacyTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPrivacyTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsPrivacyTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPropertiesTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPropertiesTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPropertiesTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPropertiesTestCases
index 40f293a..043ed92 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsPropertiesTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsPropertiesTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsPropertiesTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsPropertiesTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPropertiesTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsPropertiesTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsRegulationComplianceTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRegulationComplianceTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsRegulationComplianceTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRegulationComplianceTestCases
index b2bbb57..1134b8e 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsRegulationComplianceTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRegulationComplianceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsRegulationComplianceTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsRegulationComplianceTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsRegulationComplianceTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsRegulationComplianceTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsRlzTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRlzTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsRlzTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRlzTestCases
index 8bef375..43c4c1e 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsRlzTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRlzTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsRlzTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsRlzTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsRlzTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsRlzTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsRollbackManagerTest b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRollbackManagerTest
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsRollbackManagerTest
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRollbackManagerTest
index 76050ce..4f74008 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsRollbackManagerTest
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsRollbackManagerTest
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsRollbackManagerTest'
+NAME = 'cheets_GTS_R.9.0_r1.GtsRollbackManagerTest'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsRollbackManagerTest',
-        test_name='cheets_GTS_R.8.0_r4.GtsRollbackManagerTest',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSample b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSample
similarity index 91%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSample
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSample
index f2443ae..95d9fcd 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSample
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSample
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsSample'
+NAME = 'cheets_GTS_R.9.0_r1.GtsSample'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSample',
-        test_name='cheets_GTS_R.8.0_r4.GtsSample',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsScreenshotHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsScreenshotHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsScreenshotHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsScreenshotHostTestCases
index 2376a92..add5e17 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsScreenshotHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsScreenshotHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsScreenshotHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsScreenshotHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsScreenshotHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsScreenshotHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSearchHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSearchHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSearchHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSearchHostTestCases
index b143a6a..6d3bdf2 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSearchHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSearchHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsSearchHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsSearchHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSearchHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsSearchHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSecurityHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSecurityHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSecurityHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSecurityHostTestCases
index d755d70..4299334 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSecurityHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSecurityHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsSecurityHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsSecurityHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSecurityHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsSecurityHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSensorHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSensorHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSensorHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSensorHostTestCases
index 61e7912..e9117b4 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSensorHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSensorHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsSensorHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsSensorHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSensorHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsSensorHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSettings b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSettings
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSettings
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSettings
index 4bd73db..0f0f4c8 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSettings
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSettings
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsSettings'
+NAME = 'cheets_GTS_R.9.0_r1.GtsSettings'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSettings',
-        test_name='cheets_GTS_R.8.0_r4.GtsSettings',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSetupWizard b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSetupWizard
similarity index 89%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSetupWizard
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSetupWizard
index 9463a00..6d38b91 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSetupWizard
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSetupWizard
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsSetupWizard'
+NAME = 'cheets_GTS_R.9.0_r1.GtsSetupWizard'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSetupWizard',
-        test_name='cheets_GTS_R.8.0_r4.GtsSetupWizard',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSimAppDialogTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSimAppDialogTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSimAppDialogTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSimAppDialogTestCases
index 8adc273..e1232a9 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSimAppDialogTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSimAppDialogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsSimAppDialogTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsSimAppDialogTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSimAppDialogTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsSimAppDialogTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSmartBatteryDeviceTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSmartBatteryDeviceTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSmartBatteryDeviceTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSmartBatteryDeviceTestCases
index 2a899b2..955c5e2 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSmartBatteryDeviceTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSmartBatteryDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsSmartBatteryDeviceTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsSmartBatteryDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSmartBatteryDeviceTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsSmartBatteryDeviceTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSmsCallLogTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSmsCallLogTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSmsCallLogTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSmsCallLogTestCases
index ac60e30..0525b96 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSmsCallLogTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSmsCallLogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsSmsCallLogTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsSmsCallLogTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSmsCallLogTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsSmsCallLogTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSpeechServicesTestCases
similarity index 72%
copy from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsOemLockServiceTestCases
copy to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSpeechServicesTestCases
index 7d28771..296ae4a 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsOemLockServiceTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSpeechServicesTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsOemLockServiceTestCases'
+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 GtsOemLockServiceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -20,12 +20,12 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsOemLockServiceTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsOemLockServiceTestCases',
+        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', 'GtsOemLockServiceTestCases', '--ignore-business-logic-failure'],
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSpeechServicesTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsOemLockServiceTestCases',
+        target_module='GtsSpeechServicesTestCases',
         target_plan=None,
         uri='LATEST',
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSsaidHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSsaidHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSsaidHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSsaidHostTestCases
index f813e0d..252889d 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSsaidHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSsaidHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsSsaidHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsSsaidHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSsaidHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsSsaidHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsStagedInstallHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStagedInstallHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsStagedInstallHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStagedInstallHostTestCases
index 8e8f6f4..2fa659d 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsStagedInstallHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStagedInstallHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsStagedInstallHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsStagedInstallHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsStagedInstallHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsStagedInstallHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsStatsdHostTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStatsdHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsStatsdHostTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStatsdHostTestCases
index 9f826d2..3f8fbf5 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsStatsdHostTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStatsdHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsStatsdHostTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsStatsdHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsStatsdHostTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsStatsdHostTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsStorageTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStorageTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsStorageTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStorageTestCases
index 3469c7e..518bfaa 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsStorageTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsStorageTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsStorageTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsStorageTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsStorageTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsStorageTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSupervisionTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSupervisionTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSupervisionTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSupervisionTestCases
index 2c627a5..61d9ea0 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSupervisionTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSupervisionTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsSupervisionTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsSupervisionTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSupervisionTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsSupervisionTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSuspendApps b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSuspendApps
similarity index 89%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSuspendApps
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSuspendApps
index 491ca56..f82e407 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsSuspendApps
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsSuspendApps
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsSuspendApps'
+NAME = 'cheets_GTS_R.9.0_r1.GtsSuspendApps'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSuspendApps',
-        test_name='cheets_GTS_R.8.0_r4.GtsSuspendApps',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTelecomManagerTests b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTelecomManagerTests
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTelecomManagerTests
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTelecomManagerTests
index 45f8632..65f5c74 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTelecomManagerTests
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTelecomManagerTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsTelecomManagerTests'
+NAME = 'cheets_GTS_R.9.0_r1.GtsTelecomManagerTests'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsTelecomManagerTests',
-        test_name='cheets_GTS_R.8.0_r4.GtsTelecomManagerTests',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTelephony b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTelephony
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTelephony
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTelephony
index 45b0fb1..135ed89 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTelephony
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTelephony
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsTelephony'
+NAME = 'cheets_GTS_R.9.0_r1.GtsTelephony'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsTelephony',
-        test_name='cheets_GTS_R.8.0_r4.GtsTelephony',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTestHarnessModeTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTestHarnessModeTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTestHarnessModeTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTestHarnessModeTestCases
index 787b27b..f29c11a 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTestHarnessModeTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTestHarnessModeTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsTestHarnessModeTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsTestHarnessModeTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsTestHarnessModeTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsTestHarnessModeTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTetheringTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTetheringTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTetheringTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTetheringTestCases
index dac0f48..73de1a2 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTetheringTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTetheringTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsTetheringTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsTetheringTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsTetheringTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsTetheringTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTv b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTv
similarity index 91%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTv
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTv
index 4c1ddf0..067081e 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsTv
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsTv
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsTv'
+NAME = 'cheets_GTS_R.9.0_r1.GtsTv'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsTv',
-        test_name='cheets_GTS_R.8.0_r4.GtsTv',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsUnofficialApisUsageTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUnofficialApisUsageTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsUnofficialApisUsageTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUnofficialApisUsageTestCases
index db54c84..ab36e5d 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsUnofficialApisUsageTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUnofficialApisUsageTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsUnofficialApisUsageTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsUnofficialApisUsageTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsUnofficialApisUsageTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsUnofficialApisUsageTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsUsageStatsTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUsageStatsTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsUsageStatsTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUsageStatsTestCases
index 208f657..536407a 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsUsageStatsTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUsageStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsUsageStatsTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsUsageStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsUsageStatsTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsUsageStatsTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsUserspaceRebootHostSideTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUserspaceRebootHostSideTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsUserspaceRebootHostSideTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUserspaceRebootHostSideTestCases
index 693c97b..abd543d 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsUserspaceRebootHostSideTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsUserspaceRebootHostSideTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsUserspaceRebootHostSideTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsUserspaceRebootHostSideTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsUserspaceRebootHostSideTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsUserspaceRebootHostSideTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsViewTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsViewTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsViewTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsViewTestCases
index 1388b4a..73972d0 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsViewTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsViewTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsViewTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsViewTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsViewTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsVndkDependencyTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsVndkDependencyTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsVndkDependencyTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsVndkDependencyTestCases
index 373d39d..d0e95f6 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsVndkDependencyTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsVndkDependencyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsVndkDependencyTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsVndkDependencyTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsVndkDependencyTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsVndkDependencyTestCases',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsWebView b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsWebView
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsWebView
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsWebView
index 05b4d7a..6c211c8 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsWebView
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsWebView
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsWebView'
+NAME = 'cheets_GTS_R.9.0_r1.GtsWebView'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsWebView',
-        test_name='cheets_GTS_R.8.0_r4.GtsWebView',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsWellbeing b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsWellbeing
similarity index 90%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsWellbeing
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsWellbeing
index 5f61d39..4967d86 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsWellbeing
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsWellbeing
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsWellbeing'
+NAME = 'cheets_GTS_R.9.0_r1.GtsWellbeing'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS_R',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsWellbeing',
-        test_name='cheets_GTS_R.8.0_r4.GtsWellbeing',
+        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}'],
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsYouTubeTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsYouTubeTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.GtsYouTubeTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.GtsYouTubeTestCases
index 45356d3..12cc4df 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.GtsYouTubeTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.GtsYouTubeTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.GtsYouTubeTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.GtsYouTubeTestCases'
 ATTRIBUTES = 'suite:arc-cts-r, suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='8.0_r4.GtsYouTubeTestCases',
-        test_name='cheets_GTS_R.8.0_r4.GtsYouTubeTestCases',
+        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}'],
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
new file mode 100644
index 0000000..008844c
--- /dev/null
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases
@@ -0,0 +1,35 @@
+# 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
new file mode 100644
index 0000000..68ed56c
--- /dev/null
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases
@@ -0,0 +1,36 @@
+# 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',
+        prerequisites=['bluetooth'],
+        use_jdk9=True,
+        timeout=86400)
+
+parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases b/server/site_tests/cheets_GTS_R/control.9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases
index 256b775..857fdce 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases'
+NAME = 'cheets_GTS_R.9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases'
 ATTRIBUTES = 'suite:arc-gts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases',
-        test_name='cheets_GTS_R.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases',
+        tag='9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases',
+        test_name='cheets_GTS_R.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}'],
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
new file mode 100644
index 0000000..4e1d4a0
--- /dev/null
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases
@@ -0,0 +1,36 @@
+# 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',
+        use_jdk9=True,
+        timeout=86400)
+
+parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.8.0_r4.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_GTS_R/control.9.0_r1.tradefed-run-collect-tests-only-internal
similarity index 74%
rename from server/site_tests/cheets_GTS_R/control.8.0_r4.tradefed-run-collect-tests-only-internal
rename to server/site_tests/cheets_GTS_R/control.9.0_r1.tradefed-run-collect-tests-only-internal
index e0d1b09..c5448c7 100644
--- a/server/site_tests/cheets_GTS_R/control.8.0_r4.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_GTS_R/control.9.0_r1.tradefed-run-collect-tests-only-internal
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.8.0_r4.tradefed-run-collect-tests-only-internal'
+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
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=0,
-        tag='8.0_r4.tradefed-run-collect-tests-only-internal',
-        test_name='cheets_GTS_R.8.0_r4.tradefed-run-collect-tests-only-internal',
+        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,
@@ -30,9 +30,6 @@
         target_plan=None,
         uri='LATEST',
         use_jdk9=True,
-        # This module has a known crash bug (b/189040205). As long as the
-        # executed test count matches the known number, assume all tests ran.
-        executable_test_count=[3726, 7452],
         timeout=1800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS_R/control.CtsEdiHostTestCases
similarity index 70%
copy from server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS_R/control.CtsEdiHostTestCases
index c71c5f5..bdb8242 100644
--- a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS_R/control.CtsEdiHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsInstallerV2TestCases'
+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 GtsInstallerV2TestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -21,11 +21,11 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsInstallerV2TestCases',
-        test_name='cheets_GTS_R.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        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='GtsInstallerV2TestCases',
+        target_module='CtsEdiHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS_R/control.GtsCalendarTests
similarity index 70%
copy from server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS_R/control.GtsCalendarTests
index c71c5f5..a7414d1 100644
--- a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS_R/control.GtsCalendarTests
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsInstallerV2TestCases'
+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 GtsInstallerV2TestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -21,11 +21,11 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsInstallerV2TestCases',
-        test_name='cheets_GTS_R.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        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='GtsInstallerV2TestCases',
+        target_module='GtsCalendarTests',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS_R/control.GtsDevicePolicyHostTestCases
similarity index 68%
copy from server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS_R/control.GtsDevicePolicyHostTestCases
index c71c5f5..77b08b8 100644
--- a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS_R/control.GtsDevicePolicyHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsInstallerV2TestCases'
+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 GtsInstallerV2TestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -21,11 +21,11 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsInstallerV2TestCases',
-        test_name='cheets_GTS_R.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        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='GtsInstallerV2TestCases',
+        target_module='GtsDevicePolicyHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS_R/control.GtsDevicePolicyTestCases
similarity index 70%
copy from server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS_R/control.GtsDevicePolicyTestCases
index c71c5f5..2e61822 100644
--- a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS_R/control.GtsDevicePolicyTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsInstallerV2TestCases'
+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 GtsInstallerV2TestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -21,11 +21,11 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsInstallerV2TestCases',
-        test_name='cheets_GTS_R.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        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='GtsInstallerV2TestCases',
+        target_module='GtsDevicePolicyTestCases',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS_R/control.GtsFilesByGoogleTestCases
similarity index 69%
copy from server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS_R/control.GtsFilesByGoogleTestCases
index c71c5f5..01bf84d 100644
--- a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS_R/control.GtsFilesByGoogleTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsInstallerV2TestCases'
+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 GtsInstallerV2TestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -21,11 +21,11 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsInstallerV2TestCases',
-        test_name='cheets_GTS_R.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        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='GtsInstallerV2TestCases',
+        target_module='GtsFilesByGoogleTestCases',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS_R/control.GtsFontHostTestCases
similarity index 70%
copy from server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS_R/control.GtsFontHostTestCases
index c71c5f5..2340d72 100644
--- a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS_R/control.GtsFontHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsInstallerV2TestCases'
+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 GtsInstallerV2TestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -21,11 +21,11 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsInstallerV2TestCases',
-        test_name='cheets_GTS_R.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        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='GtsInstallerV2TestCases',
+        target_module='GtsFontHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS_R/control.GtsGameOverlayTestCases
similarity index 74%
rename from server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
rename to server/site_tests/cheets_GTS_R/control.GtsGameOverlayTestCases
index c71c5f5..1f54c92 100644
--- a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS_R/control.GtsGameOverlayTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsInstallerV2TestCases'
+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 GtsInstallerV2TestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -21,11 +21,11 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsInstallerV2TestCases',
-        test_name='cheets_GTS_R.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        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='GtsInstallerV2TestCases',
+        target_module='GtsGameOverlayTestCases',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS_R/control.GtsIncrementalInstallTriggerApp b/server/site_tests/cheets_GTS_R/control.GtsIncrementalInstallTriggerApp
deleted file mode 100644
index cb626d5..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsIncrementalInstallTriggerApp
+++ /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.GtsIncrementalInstallTriggerApp'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncrementalInstallTriggerApp of the 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='GtsIncrementalInstallTriggerApp',
-        test_name='cheets_GTS_R.GtsIncrementalInstallTriggerApp',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncrementalInstallTriggerApp', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncrementalInstallTriggerApp',
-        target_plan=None,
-        retry_manual_tests=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.GtsIncrementalInstallTriggerApp_BackgroundProcess b/server/site_tests/cheets_GTS_R/control.GtsIncrementalInstallTriggerApp_BackgroundProcess
deleted file mode 100644
index 86a2a3c..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsIncrementalInstallTriggerApp_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.GtsIncrementalInstallTriggerApp_BackgroundProcess'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncrementalInstallTriggerApp_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='GtsIncrementalInstallTriggerApp_BackgroundProcess',
-        test_name='cheets_GTS_R.GtsIncrementalInstallTriggerApp_BackgroundProcess',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncrementalInstallTriggerApp_BackgroundProcess', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsIncrementalInstallTriggerApp_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.GtsInstallerV2TestCases_BackgroundProcess b/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases_BackgroundProcess
deleted file mode 100644
index 3f7d6aa..0000000
--- a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases_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.GtsInstallerV2TestCases_BackgroundProcess'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsInstallerV2TestCases_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='GtsInstallerV2TestCases_BackgroundProcess',
-        test_name='cheets_GTS_R.GtsInstallerV2TestCases_BackgroundProcess',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases_BackgroundProcess', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallerV2TestCases_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.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS_R/control.GtsPackageRoleEnforcementTests
similarity index 68%
copy from server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS_R/control.GtsPackageRoleEnforcementTests
index c71c5f5..c12491a 100644
--- a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS_R/control.GtsPackageRoleEnforcementTests
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsInstallerV2TestCases'
+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 GtsInstallerV2TestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -21,11 +21,11 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsInstallerV2TestCases',
-        test_name='cheets_GTS_R.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        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='GtsInstallerV2TestCases',
+        target_module='GtsPackageRoleEnforcementTests',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS_R/control.GtsSpeechServicesTestCases
similarity index 69%
copy from server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS_R/control.GtsSpeechServicesTestCases
index c71c5f5..790b909 100644
--- a/server/site_tests/cheets_GTS_R/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS_R/control.GtsSpeechServicesTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS_R.GtsInstallerV2TestCases'
+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 GtsInstallerV2TestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -21,11 +21,11 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsInstallerV2TestCases',
-        test_name='cheets_GTS_R.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        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='GtsInstallerV2TestCases',
+        target_module='GtsSpeechServicesTestCases',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
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
index e35406b..3e51dfa 100644
--- 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
@@ -31,9 +31,6 @@
         retry_manual_tests=True,
         use_jdk9=True,
         warn_on_test_retry=False,
-        # This module has a known crash bug (b/189040205). As long as the
-        # executed test count matches the known number, assume all tests ran.
-        executable_test_count=[3726, 7452],
         timeout=1800)
 
 parallel_simple(run_TS, machines)