cheets_GTS (P): Uprev to 9.0r1.

BUG=b:198705543
TEST=cheets_GTS.9.0_r1.GtsPrintTestCases
TEST=cheets_GTS.GtsPrintTestCases

Change-Id: Ieee56be8b08f0e1a57554ba67ef77f88c67598b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3139518
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Jiyoun Ha <jiyounha@chromium.org>
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
(cherry picked from commit 5dd502a6621c743ad561a399b4cc6c3edde090a4)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3141328
Commit-Queue: Jiyoun Ha <jiyounha@chromium.org>
(cherry picked from commit 64638f6f3eae9b9d4ce760ff43a04d537037a819)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3194415
diff --git a/server/cros/tradefed/generate_controlfiles_GTS.py b/server/cros/tradefed/generate_controlfiles_GTS.py
index 8a9a7e9..a797b64 100755
--- a/server/cros/tradefed/generate_controlfiles_GTS.py
+++ b/server/cros/tradefed/generate_controlfiles_GTS.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'
 
 CONFIG['INTERNAL_SUITE_NAMES'] = ['suite:arc-gts']
 CONFIG['QUAL_SUITE_NAMES'] = ['suite:arc-gts-qual']
diff --git a/server/site_tests/cheets_GTS/cheets_GTS.py b/server/site_tests/cheets_GTS/cheets_GTS.py
index 155f625..c77a5d4 100644
--- a/server/site_tests/cheets_GTS/cheets_GTS.py
+++ b/server/site_tests/cheets_GTS/cheets_GTS.py
@@ -23,14 +23,14 @@
 # Maximum default time allowed for each individual GTS module.
 _GTS_TIMEOUT_SECONDS = 3600
 _PARTNER_GTS_BUCKET = 'gs://chromeos-partner-gts/'
-_PARTNER_GTS_LOCATION = _PARTNER_GTS_BUCKET + 'gts-8-R4-7380330.zip'
+_PARTNER_GTS_LOCATION = _PARTNER_GTS_BUCKET + 'android-gts-9-R1-P-7679548.zip'
 _PARTNER_GTS_AUTHKEY = _PARTNER_GTS_BUCKET + 'gts-arc.json'
 _GTS_MEDIA_URI = ('https://storage.googleapis.com/youtube-test-media/gts/' +
                   'GtsYouTubeTestCases-media-1.2.zip')
 _GTS_MEDIA_LOCALPATH = '/tmp/android-gts-media/GtsYouTubeTestCases'
 
 # Internal uprev for all GTS modules.
-_GTS_LATEST_URI = 'gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip'
+_GTS_LATEST_URI = 'gs://chromeos-arc-images/cts/bundle/android-gts-9-R1-P-7679548.zip'
 
 
 class cheets_GTS(tradefed_test.TradefedTest):
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsDeviceConfigTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsDeviceConfigTestCases
deleted file mode 100644
index fcf5ba8..0000000
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsDeviceConfigTestCases
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsDeviceConfigTestCases'
-ATTRIBUTES = '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',
-        hosts=host_list,
-        iterations=1,
-        tag='8.0_r4.GtsDeviceConfigTestCases',
-        test_name='cheets_GTS.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/control.8.0_r4.GtsInstallerV2 b/server/site_tests/cheets_GTS/control.8.0_r4.GtsInstallerV2
deleted file mode 100644
index 8a1efc7..0000000
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsInstallerV2
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsInstallerV2'
-ATTRIBUTES = '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',
-        hosts=host_list,
-        iterations=1,
-        tag='8.0_r4.GtsInstallerV2',
-        test_name='cheets_GTS.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/control.8.0_r4.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases
deleted file mode 100644
index b8cea43..0000000
--- a/server/site_tests/cheets_GTS/control.8.0_r4.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.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',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='8.0_r4.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases',
-        test_name='cheets_GTS.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/control.8.0_r4.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases
deleted file mode 100644
index 879f5c6..0000000
--- a/server/site_tests/cheets_GTS/control.8.0_r4.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.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',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        tag='8.0_r4.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases',
-        test_name='cheets_GTS.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/control.8.0_r4.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases
deleted file mode 100644
index 317bb97..0000000
--- a/server/site_tests/cheets_GTS/control.8.0_r4.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.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',
-        hosts=host_list,
-        iterations=1,
-        max_retry=9,
-        needs_push_media=True,
-        tag='8.0_r4.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases',
-        test_name='cheets_GTS.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/control.8.0_r4.GtsBackup b/server/site_tests/cheets_GTS/control.9.0_r1.CtsEdiHost
similarity index 67%
copy from server/site_tests/cheets_GTS/control.8.0_r4.GtsBackup
copy to server/site_tests/cheets_GTS/control.9.0_r1.CtsEdiHost
index 9e25ec3..9d42335 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsBackup
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.CtsEdiHost
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsBackup'
+NAME = 'cheets_GTS.9.0_r1.CtsEdiHost'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsBackupHostTestCases, GtsBackupTestCases 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',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsBackup',
-        test_name='cheets_GTS.8.0_r4.GtsBackup',
+        tag='9.0_r1.CtsEdiHost',
+        test_name='cheets_GTS.9.0_r1.CtsEdiHost',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsBackupHostTestCases', '--include-filter', 'GtsBackupTestCases', '--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='GtsBackup',
+        target_module='CtsEdiHost',
         target_plan=None,
         uri='LATEST',
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAccountsHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsAccountsHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsAccountsHostTestCases
index de39a6e..c4be1ee 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsAccountsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAccountsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsAccountsHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsAccountsHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsAccountsHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsAccountsHostTestCases',
+        tag='9.0_r1.GtsAccountsHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsAccountsHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAccountsHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsAdminTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAdminTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsAdminTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsAdminTestCases
index eeac270..5a24df2 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsAdminTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAdminTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsAdminTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsAdminTestCases'
 ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='8.0_r4.GtsAdminTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsAdminTestCases',
+        tag='9.0_r1.GtsAdminTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsAdminTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAdminTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsAfwTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAfwTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsAfwTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsAfwTestCases
index 4f03ddc..a387782 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsAfwTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAfwTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsAfwTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsAfwTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsAfwTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsAfwTestCases',
+        tag='9.0_r1.GtsAfwTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsAfwTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAfwTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsAndroidAutoDeviceTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAndroidAutoDeviceTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsAndroidAutoDeviceTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsAndroidAutoDeviceTestCases
index 7650c05..ae42910 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsAndroidAutoDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAndroidAutoDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsAndroidAutoDeviceTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsAndroidAutoDeviceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsAndroidAutoDeviceTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsAndroidAutoDeviceTestCases',
+        tag='9.0_r1.GtsAndroidAutoDeviceTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsAndroidAutoDeviceTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAndroidAutoDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsApp b/server/site_tests/cheets_GTS/control.9.0_r1.GtsApp
similarity index 91%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsApp
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsApp
index 05e2f30..c0f046c 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsApp
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsApp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsApp'
+NAME = 'cheets_GTS.9.0_r1.GtsApp'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsApp',
-        test_name='cheets_GTS.8.0_r4.GtsApp',
+        tag='9.0_r1.GtsApp',
+        test_name='cheets_GTS.9.0_r1.GtsApp',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsAppBlacklistDeviceTestCases', '--include-filter', 'GtsAppTestCases', '--include-filter', 'GtsAppVisibilityDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsArtManagerHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsArtManagerHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsArtManagerHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsArtManagerHostTestCases
index 9c87b13..2e7c7d7 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsArtManagerHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsArtManagerHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsArtManagerHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsArtManagerHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsArtManagerHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsArtManagerHostTestCases',
+        tag='9.0_r1.GtsArtManagerHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsArtManagerHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsArtManagerHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsAssistIntentTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAssistIntentTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsAssistIntentTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsAssistIntentTestCases
index 842c5d5..66af3b7 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsAssistIntentTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAssistIntentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsAssistIntentTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsAssistIntentTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsAssistIntentTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsAssistIntentTestCases',
+        tag='9.0_r1.GtsAssistIntentTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsAssistIntentTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAssistIntentTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsAssistant b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAssistant
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsAssistant
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsAssistant
index ca853d1..c098f72 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsAssistant
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAssistant
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsAssistant'
+NAME = 'cheets_GTS.9.0_r1.GtsAssistant'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsAssistant',
-        test_name='cheets_GTS.8.0_r4.GtsAssistant',
+        tag='9.0_r1.GtsAssistant',
+        test_name='cheets_GTS.9.0_r1.GtsAssistant',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsAssistantHostTestCases', '--include-filter', 'GtsAssistantMicHostTestCases', '--include-filter', 'GtsAssistantWorkProfileHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsAudioTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAudioTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsAudioTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsAudioTestCases
index 205db64..6e7113f 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsAudioTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsAudioTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsAudioTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsAudioTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsAudioTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsAudioTestCases',
+        tag='9.0_r1.GtsAudioTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsAudioTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAudioTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsBackup b/server/site_tests/cheets_GTS/control.9.0_r1.GtsBackup
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsBackup
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsBackup
index 9e25ec3..3766e53 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsBackup
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsBackup
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsBackup'
+NAME = 'cheets_GTS.9.0_r1.GtsBackup'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsBackup',
-        test_name='cheets_GTS.8.0_r4.GtsBackup',
+        tag='9.0_r1.GtsBackup',
+        test_name='cheets_GTS.9.0_r1.GtsBackup',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsBackupHostTestCases', '--include-filter', 'GtsBackupTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsBoot b/server/site_tests/cheets_GTS/control.9.0_r1.GtsBoot
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsBoot
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsBoot
index 260f571..e3c0b68 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsBoot
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsBoot
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsBoot'
+NAME = 'cheets_GTS.9.0_r1.GtsBoot'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsBoot',
-        test_name='cheets_GTS.8.0_r4.GtsBoot',
+        tag='9.0_r1.GtsBoot',
+        test_name='cheets_GTS.9.0_r1.GtsBoot',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsBootHealthHostTestCases', '--include-filter', 'GtsBootStatsTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsCNGCoreTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCNGCoreTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsCNGCoreTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsCNGCoreTestCases
index c52984f..e200f6f 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsCNGCoreTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCNGCoreTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsCNGCoreTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsCNGCoreTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsCNGCoreTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsCNGCoreTestCases',
+        tag='9.0_r1.GtsCNGCoreTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsCNGCoreTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCNGCoreTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsLensTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCalendarTests
similarity index 74%
copy from server/site_tests/cheets_GTS/control.8.0_r4.GtsLensTestCases
copy to server/site_tests/cheets_GTS/control.9.0_r1.GtsCalendarTests
index 29ca626..f871900 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsLensTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCalendarTests
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsLensTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsCalendarTests'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLensTestCases 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',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsLensTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsLensTestCases',
+        tag='9.0_r1.GtsCalendarTests',
+        test_name='cheets_GTS.9.0_r1.GtsCalendarTests',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLensTestCases', '--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='GtsLensTestCases',
+        target_module='GtsCalendarTests',
         target_plan=None,
         uri='LATEST',
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsCallLogTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCallLogTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsCallLogTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsCallLogTestCases
index 3e7019d..a695359 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsCallLogTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCallLogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsCallLogTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsCallLogTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsCallLogTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsCallLogTestCases',
+        tag='9.0_r1.GtsCallLogTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsCallLogTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCallLogTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsCameraTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCameraTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsCameraTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsCameraTestCases
index 01ed97b..3998fd7 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsCameraTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCameraTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsCameraTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsCameraTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsCameraTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsCameraTestCases',
+        tag='9.0_r1.GtsCameraTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsCameraTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCameraTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsCastHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCastHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsCastHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsCastHostTestCases
index 770fe65..d3a27a7 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsCastHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsCastHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsCastHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsCastHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsCastHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsCastHostTestCases',
+        tag='9.0_r1.GtsCastHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsCastHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCastHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsContacts b/server/site_tests/cheets_GTS/control.9.0_r1.GtsContacts
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsContacts
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsContacts
index 39abe67..f6e1662 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsContacts
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsContacts
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsContacts'
+NAME = 'cheets_GTS.9.0_r1.GtsContacts'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsContacts',
-        test_name='cheets_GTS.8.0_r4.GtsContacts',
+        tag='9.0_r1.GtsContacts',
+        test_name='cheets_GTS.9.0_r1.GtsContacts',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsContactsAppDeviceTestCases', '--include-filter', 'GtsContactsTest', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsContent b/server/site_tests/cheets_GTS/control.9.0_r1.GtsContent
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsContent
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsContent
index 3dad1b1..bd43298 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsContent
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsContent
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsContent'
+NAME = 'cheets_GTS.9.0_r1.GtsContent'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsContent',
-        test_name='cheets_GTS.8.0_r4.GtsContent',
+        tag='9.0_r1.GtsContent',
+        test_name='cheets_GTS.9.0_r1.GtsContent',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsContentHostTestCases', '--include-filter', 'GtsContentTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsContextHubPermissionDeviceTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsContextHubPermissionDeviceTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsContextHubPermissionDeviceTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsContextHubPermissionDeviceTestCases
index 78dde7b..b9cd841 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsContextHubPermissionDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsContextHubPermissionDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsContextHubPermissionDeviceTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsContextHubPermissionDeviceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsContextHubPermissionDeviceTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsContextHubPermissionDeviceTestCases',
+        tag='9.0_r1.GtsContextHubPermissionDeviceTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsContextHubPermissionDeviceTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContextHubPermissionDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsDebugfsMountTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDebugfsMountTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsDebugfsMountTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsDebugfsMountTestCases
index e391ba6..779415a 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsDebugfsMountTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDebugfsMountTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsDebugfsMountTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsDebugfsMountTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsDebugfsMountTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsDebugfsMountTestCases',
+        tag='9.0_r1.GtsDebugfsMountTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsDebugfsMountTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDebugfsMountTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.GtsDevice b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDevice
new file mode 100644
index 0000000..113246d
--- /dev/null
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDevice
@@ -0,0 +1,34 @@
+# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_GTS.9.0_r1.GtsDevice'
+ATTRIBUTES = 'suite:arc-gts'
+DEPENDENCIES = 'arc'
+JOB_RETRIES = 1
+TEST_TYPE = 'server'
+TIME = 'MEDIUM'
+MAX_RESULT_SIZE_KB = 307200
+DOC = 'Run module GtsDeviceConfigTestCases, GtsDevicePolicyHostTestCases, GtsDevicePolicyTestCases, GtsDevicePolicyTestCases[secondary_user] of the Android Google Test Suite (GTS) in the ARC++ container.'
+
+def run_TS(machine):
+    host_list = [hosts.create_host(machine)]
+    job.run_test(
+        'cheets_GTS',
+        hosts=host_list,
+        iterations=1,
+        tag='9.0_r1.GtsDevice',
+        test_name='cheets_GTS.9.0_r1.GtsDevice',
+        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
+        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsDeviceConfigTestCases', '--include-filter', 'GtsDevicePolicyHostTestCases', '--include-filter', 'GtsDevicePolicyTestCases', '--include-filter', 'GtsDevicePolicyTestCases[secondary_user]', '--ignore-business-logic-failure'],
+        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        target_module='GtsDevice',
+        target_plan=None,
+        uri='LATEST',
+        use_jdk9=True,
+        timeout=1800)
+
+parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsDexModuleRegistrationTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDexModuleRegistrationTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsDexModuleRegistrationTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsDexModuleRegistrationTestCases
index 06d94d9..7324ee7 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsDexModuleRegistrationTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDexModuleRegistrationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsDexModuleRegistrationTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsDexModuleRegistrationTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsDexModuleRegistrationTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsDexModuleRegistrationTestCases',
+        tag='9.0_r1.GtsDexModuleRegistrationTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsDexModuleRegistrationTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDexModuleRegistrationTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsDialer b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDialer
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsDialer
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsDialer
index dc92970..d17157d 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsDialer
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDialer
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsDialer'
+NAME = 'cheets_GTS.9.0_r1.GtsDialer'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsDialer',
-        test_name='cheets_GTS.8.0_r4.GtsDialer',
+        tag='9.0_r1.GtsDialer',
+        test_name='cheets_GTS.9.0_r1.GtsDialer',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsDialerAudioTestCases', '--include-filter', 'GtsDialerDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsDoze b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDoze
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsDoze
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsDoze
index 55f40a2..2ec0cc6 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsDoze
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDoze
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsDoze'
+NAME = 'cheets_GTS.9.0_r1.GtsDoze'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsDoze',
-        test_name='cheets_GTS.8.0_r4.GtsDoze',
+        tag='9.0_r1.GtsDoze',
+        test_name='cheets_GTS.9.0_r1.GtsDoze',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsDozeDeviceTestCases', '--include-filter', 'GtsDozeHostSideTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsDuoReadyTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDuoReadyTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsDuoReadyTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsDuoReadyTestCases
index 7fb2ff3..b5b358b 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsDuoReadyTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsDuoReadyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsDuoReadyTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsDuoReadyTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsDuoReadyTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsDuoReadyTestCases',
+        tag='9.0_r1.GtsDuoReadyTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsDuoReadyTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDuoReadyTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsEdiHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsEdiHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsEdiHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsEdiHostTestCases
index 78ae659..a461162 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsEdiHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsEdiHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsEdiHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsEdiHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsEdiHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsEdiHostTestCases',
+        tag='9.0_r1.GtsEdiHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsEdiHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsEdiHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsExoPlayerTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsExoPlayerTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases
index ed30438..3b3e0c7 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsExoPlayerTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsExoPlayerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsExoPlayerTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsExoPlayerTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsExoPlayerTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsExoPlayerTestCases',
+        tag='9.0_r1.GtsExoPlayerTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsExoPlayerTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsExoPlayerTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsFeaturesTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsFeaturesTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsFeaturesTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsFeaturesTestCases
index 3c19791..3d14808 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsFeaturesTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsFeaturesTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsFeaturesTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsFeaturesTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsFeaturesTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsFeaturesTestCases',
+        tag='9.0_r1.GtsFeaturesTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsFeaturesTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFeaturesTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPrintTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsFilesByGoogleTestCases
similarity index 69%
copy from server/site_tests/cheets_GTS/control.8.0_r4.GtsPrintTestCases
copy to server/site_tests/cheets_GTS/control.9.0_r1.GtsFilesByGoogleTestCases
index 45fc95f..1708d63 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPrintTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsFilesByGoogleTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsPrintTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsFilesByGoogleTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPrintTestCases 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',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPrintTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsPrintTestCases',
+        tag='9.0_r1.GtsFilesByGoogleTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsFilesByGoogleTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrintTestCases', '--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='GtsPrintTestCases',
+        target_module='GtsFilesByGoogleTestCases',
         target_plan=None,
         uri='LATEST',
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsFeaturesTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsFontHostTestCases
similarity index 73%
copy from server/site_tests/cheets_GTS/control.8.0_r4.GtsFeaturesTestCases
copy to server/site_tests/cheets_GTS/control.9.0_r1.GtsFontHostTestCases
index 3c19791..c9584c3 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsFeaturesTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsFontHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsFeaturesTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsFontHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsFeaturesTestCases 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',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsFeaturesTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsFeaturesTestCases',
+        tag='9.0_r1.GtsFontHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsFontHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFeaturesTestCases', '--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='GtsFeaturesTestCases',
+        target_module='GtsFontHostTestCases',
         target_plan=None,
         uri='LATEST',
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSupervisionTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsGameOverlayTestCases
similarity index 73%
copy from server/site_tests/cheets_GTS/control.8.0_r4.GtsSupervisionTestCases
copy to server/site_tests/cheets_GTS/control.9.0_r1.GtsGameOverlayTestCases
index 1d2d6cd..e5ebf7f 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSupervisionTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsGameOverlayTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsSupervisionTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsGameOverlayTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module 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',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSupervisionTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsSupervisionTestCases',
+        tag='9.0_r1.GtsGameOverlayTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsGameOverlayTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', '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/control.8.0_r4.GtsGmscoreHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsGmscoreHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsGmscoreHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsGmscoreHostTestCases
index 7b8a9ec..c942ffa 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsGmscoreHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsGmscoreHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsGmscoreHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsGmscoreHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsGmscoreHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsGmscoreHostTestCases',
+        tag='9.0_r1.GtsGmscoreHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsGmscoreHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGmscoreHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsGraphicsHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsGraphicsHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsGraphicsHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsGraphicsHostTestCases
index 64d98f2..17e1b3d 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsGraphicsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsGraphicsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsGraphicsHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsGraphicsHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsGraphicsHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsGraphicsHostTestCases',
+        tag='9.0_r1.GtsGraphicsHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsGraphicsHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGraphicsHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsHomeHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsHomeHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsHomeHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsHomeHostTestCases
index 0bee75b..c10124b 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsHomeHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsHomeHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsHomeHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsHomeHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsHomeHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsHomeHostTestCases',
+        tag='9.0_r1.GtsHomeHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsHomeHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsHomeHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsIncident b/server/site_tests/cheets_GTS/control.9.0_r1.GtsIncident
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsIncident
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsIncident
index c951635..7b32c3d 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsIncident
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsIncident
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsIncident'
+NAME = 'cheets_GTS.9.0_r1.GtsIncident'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsIncident',
-        test_name='cheets_GTS.8.0_r4.GtsIncident',
+        tag='9.0_r1.GtsIncident',
+        test_name='cheets_GTS.9.0_r1.GtsIncident',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsIncidentConfirmationTestCases', '--include-filter', 'GtsIncidentManagerTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsIncrementalInstall b/server/site_tests/cheets_GTS/control.9.0_r1.GtsIncrementalInstall
similarity index 69%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsIncrementalInstall
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsIncrementalInstall
index b0bb20c..1c7b962 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsIncrementalInstall
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsIncrementalInstall
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsIncrementalInstall'
+NAME = 'cheets_GTS.9.0_r1.GtsIncrementalInstall'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsIncrementalInstallProxyHostTestCases, GtsIncrementalInstallTestCases, GtsIncrementalInstallTestCases_BackgroundProcess, 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',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsIncrementalInstall',
-        test_name='cheets_GTS.8.0_r4.GtsIncrementalInstall',
+        tag='9.0_r1.GtsIncrementalInstall',
+        test_name='cheets_GTS.9.0_r1.GtsIncrementalInstall',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsIncrementalInstallProxyHostTestCases', '--include-filter', 'GtsIncrementalInstallTestCases', '--include-filter', 'GtsIncrementalInstallTestCases_BackgroundProcess', '--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/control.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases
index f221903..4ab9703 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases',
+        tag='9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsInstallPackagesWhitelistDeviceTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallPackagesWhitelistDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsInstantAppsHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsInstantAppsHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsInstantAppsHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsInstantAppsHostTestCases
index fde9568..c4a51af 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsInstantAppsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsInstantAppsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsInstantAppsHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsInstantAppsHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsInstantAppsHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsInstantAppsHostTestCases',
+        tag='9.0_r1.GtsInstantAppsHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsInstantAppsHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstantAppsHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsJniUncompressHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsJniUncompressHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsJniUncompressHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsJniUncompressHostTestCases
index 5515082..f7d0f4d 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsJniUncompressHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsJniUncompressHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsJniUncompressHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsJniUncompressHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsJniUncompressHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsJniUncompressHostTestCases',
+        tag='9.0_r1.GtsJniUncompressHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsJniUncompressHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsJniUncompressHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsKidsHomeHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsKidsHomeHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsKidsHomeHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsKidsHomeHostTestCases
index 6428290..f4cf242 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsKidsHomeHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsKidsHomeHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsKidsHomeHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsKidsHomeHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsKidsHomeHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsKidsHomeHostTestCases',
+        tag='9.0_r1.GtsKidsHomeHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsKidsHomeHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsKidsHomeHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsLargeApkHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsLargeApkHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsLargeApkHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsLargeApkHostTestCases
index 701ab0d..92db949 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsLargeApkHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsLargeApkHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsLargeApkHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsLargeApkHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsLargeApkHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsLargeApkHostTestCases',
+        tag='9.0_r1.GtsLargeApkHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsLargeApkHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLargeApkHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsLensTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsLensTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsLensTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsLensTestCases
index 29ca626..ba35701 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsLensTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsLensTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsLensTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsLensTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsLensTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsLensTestCases',
+        tag='9.0_r1.GtsLensTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsLensTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLensTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsLinkerConfig b/server/site_tests/cheets_GTS/control.9.0_r1.GtsLinkerConfig
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsLinkerConfig
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsLinkerConfig
index 7f771bc..7f9b00e 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsLinkerConfig
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsLinkerConfig
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsLinkerConfig'
+NAME = 'cheets_GTS.9.0_r1.GtsLinkerConfig'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsLinkerConfig',
-        test_name='cheets_GTS.8.0_r4.GtsLinkerConfig',
+        tag='9.0_r1.GtsLinkerConfig',
+        test_name='cheets_GTS.9.0_r1.GtsLinkerConfig',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsLinkerConfigTestCases', '--include-filter', 'GtsLinkerConfigTestCases[secondary_user]', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsLocation b/server/site_tests/cheets_GTS/control.9.0_r1.GtsLocation
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsLocation
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsLocation
index 4f9d233..adbb31d 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsLocation
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsLocation
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsLocation'
+NAME = 'cheets_GTS.9.0_r1.GtsLocation'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsLocation',
-        test_name='cheets_GTS.8.0_r4.GtsLocation',
+        tag='9.0_r1.GtsLocation',
+        test_name='cheets_GTS.9.0_r1.GtsLocation',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsLocationHostTestCases', '--include-filter', 'GtsLocationTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsMbaPrivilegedPermissionTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsMbaPrivilegedPermissionTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsMbaPrivilegedPermissionTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsMbaPrivilegedPermissionTestCases
index 2babaf9..a1c499b 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsMbaPrivilegedPermissionTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsMbaPrivilegedPermissionTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsMbaPrivilegedPermissionTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsMbaPrivilegedPermissionTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsMbaPrivilegedPermissionTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsMbaPrivilegedPermissionTestCases',
+        tag='9.0_r1.GtsMbaPrivilegedPermissionTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsMbaPrivilegedPermissionTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMbaPrivilegedPermissionTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsMediaTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsMediaTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsMediaTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsMediaTestCases
index 7c0f65d..447ddb1 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsMediaTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsMediaTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsMediaTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsMediaTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsMediaTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsMediaTestCases',
+        tag='9.0_r1.GtsMediaTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsMediaTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsMemory b/server/site_tests/cheets_GTS/control.9.0_r1.GtsMemory
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsMemory
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsMemory
index c79ae1f..a1ec5dc 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsMemory
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsMemory
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsMemory'
+NAME = 'cheets_GTS.9.0_r1.GtsMemory'
 ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='8.0_r4.GtsMemory',
-        test_name='cheets_GTS.8.0_r4.GtsMemory',
+        tag='9.0_r1.GtsMemory',
+        test_name='cheets_GTS.9.0_r1.GtsMemory',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsMemoryHostTestCases', '--include-filter', 'GtsMemoryTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsModuleMetadataTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsModuleMetadataTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsModuleMetadataTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsModuleMetadataTestCases
index ba5114f..1c98b56 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsModuleMetadataTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsModuleMetadataTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsModuleMetadataTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsModuleMetadataTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsModuleMetadataTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsModuleMetadataTestCases',
+        tag='9.0_r1.GtsModuleMetadataTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsModuleMetadataTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsModuleMetadataTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsNet b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNet
similarity index 91%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsNet
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsNet
index 751db11..1fc5be3 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsNet
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNet
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsNet'
+NAME = 'cheets_GTS.9.0_r1.GtsNet'
 ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='8.0_r4.GtsNet',
-        test_name='cheets_GTS.8.0_r4.GtsNet',
+        tag='9.0_r1.GtsNet',
+        test_name='cheets_GTS.9.0_r1.GtsNet',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsNetStatsHostTestCases', '--include-filter', 'GtsNetTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsNetwork b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNetwork
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsNetwork
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsNetwork
index 1a0088c..0759323 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsNetwork
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNetwork
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsNetwork'
+NAME = 'cheets_GTS.9.0_r1.GtsNetwork'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsNetwork',
-        test_name='cheets_GTS.8.0_r4.GtsNetwork',
+        tag='9.0_r1.GtsNetwork',
+        test_name='cheets_GTS.9.0_r1.GtsNetwork',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsNetworkStackHostTestCases', '--include-filter', 'GtsNetworkWatchlistTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsNmgiarcTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNmgiarcTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsNmgiarcTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsNmgiarcTestCases
index d39b21f..168a069 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsNmgiarcTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNmgiarcTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsNmgiarcTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsNmgiarcTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsNmgiarcTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsNmgiarcTestCases',
+        tag='9.0_r1.GtsNmgiarcTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsNmgiarcTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNmgiarcTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsNoPermission b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNoPermission
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsNoPermission
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsNoPermission
index 29593ca..1d9c959 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsNoPermission
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNoPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsNoPermission'
+NAME = 'cheets_GTS.9.0_r1.GtsNoPermission'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsNoPermission',
-        test_name='cheets_GTS.8.0_r4.GtsNoPermission',
+        tag='9.0_r1.GtsNoPermission',
+        test_name='cheets_GTS.9.0_r1.GtsNoPermission',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsNoPermissionTestCases', '--include-filter', 'GtsNoPermissionTestCases25', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsNotificationTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNotificationTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsNotificationTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsNotificationTestCases
index dde520f..8390804 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsNotificationTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsNotificationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsNotificationTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsNotificationTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsNotificationTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsNotificationTestCases',
+        tag='9.0_r1.GtsNotificationTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsNotificationTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNotificationTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsOemLockServiceTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsOemLockServiceTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsOemLockServiceTestCases
index 0f27de6..14d41bd 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsOemLockServiceTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsOemLockServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsOemLockServiceTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsOemLockServiceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsOemLockServiceTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsOemLockServiceTestCases',
+        tag='9.0_r1.GtsOemLockServiceTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsOemLockServiceTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsOemLockServiceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsOsTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsOsTestCases
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsOsTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsOsTestCases
index d9d2cb1..72901e1 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsOsTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsOsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsOsTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsOsTestCases'
 ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='8.0_r4.GtsOsTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsOsTestCases',
+        tag='9.0_r1.GtsOsTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsOsTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsOsTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPackage b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPackage
similarity index 72%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsPackage
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsPackage
index d77fcbb..7c796c0 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPackage
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPackage
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsPackage'
+NAME = 'cheets_GTS.9.0_r1.GtsPackage'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPackageInstallTestCases, GtsPackageInstallerTapjackingTestCases, GtsPackageManagerHostTestCases, GtsPackageNameCertPairsDeviceTestCases, 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',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPackage',
-        test_name='cheets_GTS.8.0_r4.GtsPackage',
+        tag='9.0_r1.GtsPackage',
+        test_name='cheets_GTS.9.0_r1.GtsPackage',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsPackageInstallTestCases', '--include-filter', 'GtsPackageInstallerTapjackingTestCases', '--include-filter', 'GtsPackageManagerHostTestCases', '--include-filter', 'GtsPackageNameCertPairsDeviceTestCases', '--include-filter', '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/control.8.0_r4.GtsPartnerBookmarksTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPartnerBookmarksTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsPartnerBookmarksTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsPartnerBookmarksTestCases
index 658b34a..b1256d0 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPartnerBookmarksTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPartnerBookmarksTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsPartnerBookmarksTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsPartnerBookmarksTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPartnerBookmarksTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsPartnerBookmarksTestCases',
+        tag='9.0_r1.GtsPartnerBookmarksTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsPartnerBookmarksTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPartnerBookmarksTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPermission b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPermission
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsPermission
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsPermission
index 4433107..1c412e9 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPermission
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsPermission'
+NAME = 'cheets_GTS.9.0_r1.GtsPermission'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPermission',
-        test_name='cheets_GTS.8.0_r4.GtsPermission',
+        tag='9.0_r1.GtsPermission',
+        test_name='cheets_GTS.9.0_r1.GtsPermission',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsPermissionControllerHostTestCases', '--include-filter', 'GtsPermissionTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPlacementTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPlacementTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsPlacementTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsPlacementTestCases
index e88ba46..fed66a0 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPlacementTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPlacementTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsPlacementTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsPlacementTestCases'
 ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='8.0_r4.GtsPlacementTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsPlacementTestCases',
+        tag='9.0_r1.GtsPlacementTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsPlacementTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlacementTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPlay b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPlay
similarity index 91%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsPlay
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsPlay
index a932209..4428e72 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPlay
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPlay
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsPlay'
+NAME = 'cheets_GTS.9.0_r1.GtsPlay'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPlay',
-        test_name='cheets_GTS.8.0_r4.GtsPlay',
+        tag='9.0_r1.GtsPlay',
+        test_name='cheets_GTS.9.0_r1.GtsPlay',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsPlayAutoInstallTestCases', '--include-filter', 'GtsPlayFsiHostTestCases', '--include-filter', 'GtsPlayFsiTestCases', '--include-filter', 'GtsPlayStoreHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPrintTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPrintTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsPrintTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsPrintTestCases
index 45fc95f..04d13ca 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPrintTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPrintTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsPrintTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsPrintTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPrintTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsPrintTestCases',
+        tag='9.0_r1.GtsPrintTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsPrintTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrintTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPrivacyTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPrivacyTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsPrivacyTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsPrivacyTestCases
index cfe7742..f81ab2c 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPrivacyTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPrivacyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsPrivacyTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsPrivacyTestCases'
 ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='8.0_r4.GtsPrivacyTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsPrivacyTestCases',
+        tag='9.0_r1.GtsPrivacyTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsPrivacyTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrivacyTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPropertiesTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPropertiesTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsPropertiesTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsPropertiesTestCases
index 1eef425..b330eaa 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsPropertiesTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsPropertiesTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsPropertiesTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsPropertiesTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsPropertiesTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsPropertiesTestCases',
+        tag='9.0_r1.GtsPropertiesTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsPropertiesTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPropertiesTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsRegulationComplianceTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsRegulationComplianceTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsRegulationComplianceTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsRegulationComplianceTestCases
index b1431ea..1bbd8f8 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsRegulationComplianceTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsRegulationComplianceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsRegulationComplianceTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsRegulationComplianceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsRegulationComplianceTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsRegulationComplianceTestCases',
+        tag='9.0_r1.GtsRegulationComplianceTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsRegulationComplianceTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRegulationComplianceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsRlzTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsRlzTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsRlzTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsRlzTestCases
index e03d3eb..53e653a 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsRlzTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsRlzTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsRlzTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsRlzTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsRlzTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsRlzTestCases',
+        tag='9.0_r1.GtsRlzTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsRlzTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRlzTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsRollbackManagerTest b/server/site_tests/cheets_GTS/control.9.0_r1.GtsRollbackManagerTest
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsRollbackManagerTest
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsRollbackManagerTest
index d08c46a..2e705ca 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsRollbackManagerTest
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsRollbackManagerTest
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsRollbackManagerTest'
+NAME = 'cheets_GTS.9.0_r1.GtsRollbackManagerTest'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsRollbackManagerTest',
-        test_name='cheets_GTS.8.0_r4.GtsRollbackManagerTest',
+        tag='9.0_r1.GtsRollbackManagerTest',
+        test_name='cheets_GTS.9.0_r1.GtsRollbackManagerTest',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRollbackManagerTest', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSample b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSample
similarity index 91%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsSample
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsSample
index 8600ac3..cbaf15d 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSample
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSample
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsSample'
+NAME = 'cheets_GTS.9.0_r1.GtsSample'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSample',
-        test_name='cheets_GTS.8.0_r4.GtsSample',
+        tag='9.0_r1.GtsSample',
+        test_name='cheets_GTS.9.0_r1.GtsSample',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSampleDeviceTestCases', '--include-filter', 'GtsSampleDynamicConfigTestCases', '--include-filter', 'GtsSampleHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsScreenshotHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsScreenshotHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsScreenshotHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsScreenshotHostTestCases
index b558233..78ca6c9 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsScreenshotHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsScreenshotHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsScreenshotHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsScreenshotHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsScreenshotHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsScreenshotHostTestCases',
+        tag='9.0_r1.GtsScreenshotHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsScreenshotHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsScreenshotHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSearchHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSearchHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsSearchHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsSearchHostTestCases
index cbe1d15..7d8fd67 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSearchHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSearchHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsSearchHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsSearchHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSearchHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsSearchHostTestCases',
+        tag='9.0_r1.GtsSearchHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsSearchHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSearchHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSecurityHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSecurityHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsSecurityHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsSecurityHostTestCases
index ba7694c..73c4039 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSecurityHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSecurityHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsSecurityHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsSecurityHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSecurityHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsSecurityHostTestCases',
+        tag='9.0_r1.GtsSecurityHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsSecurityHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSecurityHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSensorHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSensorHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsSensorHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsSensorHostTestCases
index af6c819..64c2d02 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSensorHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSensorHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsSensorHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsSensorHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSensorHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsSensorHostTestCases',
+        tag='9.0_r1.GtsSensorHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsSensorHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSensorHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSettings b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSettings
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsSettings
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsSettings
index abe1a47..299404a 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSettings
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSettings
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsSettings'
+NAME = 'cheets_GTS.9.0_r1.GtsSettings'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSettings',
-        test_name='cheets_GTS.8.0_r4.GtsSettings',
+        tag='9.0_r1.GtsSettings',
+        test_name='cheets_GTS.9.0_r1.GtsSettings',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSettingsHostTestCases', '--include-filter', 'GtsSettingsTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSetupWizard b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSetupWizard
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsSetupWizard
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsSetupWizard
index 72dd0eb..6f6d497 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSetupWizard
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSetupWizard
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsSetupWizard'
+NAME = 'cheets_GTS.9.0_r1.GtsSetupWizard'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSetupWizard',
-        test_name='cheets_GTS.8.0_r4.GtsSetupWizard',
+        tag='9.0_r1.GtsSetupWizard',
+        test_name='cheets_GTS.9.0_r1.GtsSetupWizard',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSetupWizardHostTestCases', '--include-filter', 'GtsSetupWizardNoPermissionTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSimAppDialogTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSimAppDialogTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsSimAppDialogTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsSimAppDialogTestCases
index 20245e1..6657901 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSimAppDialogTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSimAppDialogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsSimAppDialogTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsSimAppDialogTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSimAppDialogTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsSimAppDialogTestCases',
+        tag='9.0_r1.GtsSimAppDialogTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsSimAppDialogTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSimAppDialogTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSmartBatteryDeviceTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSmartBatteryDeviceTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsSmartBatteryDeviceTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsSmartBatteryDeviceTestCases
index c445879..821ffbe 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSmartBatteryDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSmartBatteryDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsSmartBatteryDeviceTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsSmartBatteryDeviceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSmartBatteryDeviceTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsSmartBatteryDeviceTestCases',
+        tag='9.0_r1.GtsSmartBatteryDeviceTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsSmartBatteryDeviceTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSmartBatteryDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSmsCallLogTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSmsCallLogTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsSmsCallLogTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsSmsCallLogTestCases
index 51d6575..e253b57 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSmsCallLogTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSmsCallLogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsSmsCallLogTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsSmsCallLogTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSmsCallLogTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsSmsCallLogTestCases',
+        tag='9.0_r1.GtsSmsCallLogTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsSmsCallLogTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSmsCallLogTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsVndkDependencyTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSpeechServicesTestCases
similarity index 72%
copy from server/site_tests/cheets_GTS/control.8.0_r4.GtsVndkDependencyTestCases
copy to server/site_tests/cheets_GTS/control.9.0_r1.GtsSpeechServicesTestCases
index ee41977..339293c 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsVndkDependencyTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSpeechServicesTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsVndkDependencyTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsSpeechServicesTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsVndkDependencyTestCases 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',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsVndkDependencyTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsVndkDependencyTestCases',
+        tag='9.0_r1.GtsSpeechServicesTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsSpeechServicesTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsVndkDependencyTestCases', '--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='GtsVndkDependencyTestCases',
+        target_module='GtsSpeechServicesTestCases',
         target_plan=None,
         uri='LATEST',
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSsaidHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSsaidHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsSsaidHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsSsaidHostTestCases
index 45964f6..bda1eab 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSsaidHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSsaidHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsSsaidHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsSsaidHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSsaidHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsSsaidHostTestCases',
+        tag='9.0_r1.GtsSsaidHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsSsaidHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSsaidHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsStagedInstallHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsStagedInstallHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsStagedInstallHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsStagedInstallHostTestCases
index 353aa26..8d4a847 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsStagedInstallHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsStagedInstallHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsStagedInstallHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsStagedInstallHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsStagedInstallHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsStagedInstallHostTestCases',
+        tag='9.0_r1.GtsStagedInstallHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsStagedInstallHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStagedInstallHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsStatsdHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsStatsdHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsStatsdHostTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsStatsdHostTestCases
index cebe721..42e8474 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsStatsdHostTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsStatsdHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsStatsdHostTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsStatsdHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsStatsdHostTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsStatsdHostTestCases',
+        tag='9.0_r1.GtsStatsdHostTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsStatsdHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStatsdHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsStorageTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsStorageTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsStorageTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsStorageTestCases
index 5756589..450d163 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsStorageTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsStorageTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsStorageTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsStorageTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsStorageTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsStorageTestCases',
+        tag='9.0_r1.GtsStorageTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsStorageTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStorageTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSupervisionTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSupervisionTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsSupervisionTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsSupervisionTestCases
index 1d2d6cd..48a0f3e 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSupervisionTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSupervisionTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsSupervisionTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsSupervisionTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSupervisionTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsSupervisionTestCases',
+        tag='9.0_r1.GtsSupervisionTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsSupervisionTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSupervisionTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSuspendApps b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSuspendApps
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsSuspendApps
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsSuspendApps
index 1cec3cb..f61f2eb 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsSuspendApps
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsSuspendApps
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsSuspendApps'
+NAME = 'cheets_GTS.9.0_r1.GtsSuspendApps'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsSuspendApps',
-        test_name='cheets_GTS.8.0_r4.GtsSuspendApps',
+        tag='9.0_r1.GtsSuspendApps',
+        test_name='cheets_GTS.9.0_r1.GtsSuspendApps',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSuspendAppsPermissionTestCases', '--include-filter', 'GtsSuspendAppsTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsTelecomManagerTests b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTelecomManagerTests
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsTelecomManagerTests
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsTelecomManagerTests
index 3b5b38f..edf482f 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsTelecomManagerTests
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTelecomManagerTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsTelecomManagerTests'
+NAME = 'cheets_GTS.9.0_r1.GtsTelecomManagerTests'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsTelecomManagerTests',
-        test_name='cheets_GTS.8.0_r4.GtsTelecomManagerTests',
+        tag='9.0_r1.GtsTelecomManagerTests',
+        test_name='cheets_GTS.9.0_r1.GtsTelecomManagerTests',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTelecomManagerTests', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsTelephony b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTelephony
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsTelephony
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsTelephony
index 811c65b..346e879 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsTelephony
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTelephony
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsTelephony'
+NAME = 'cheets_GTS.9.0_r1.GtsTelephony'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsTelephony',
-        test_name='cheets_GTS.8.0_r4.GtsTelephony',
+        tag='9.0_r1.GtsTelephony',
+        test_name='cheets_GTS.9.0_r1.GtsTelephony',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsTelephonyNumberVerificationHostCases', '--include-filter', 'GtsTelephonyTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsTestHarnessModeTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTestHarnessModeTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsTestHarnessModeTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsTestHarnessModeTestCases
index a11b38a..31836a3 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsTestHarnessModeTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTestHarnessModeTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsTestHarnessModeTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsTestHarnessModeTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsTestHarnessModeTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsTestHarnessModeTestCases',
+        tag='9.0_r1.GtsTestHarnessModeTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsTestHarnessModeTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTestHarnessModeTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsTetheringTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTetheringTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsTetheringTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsTetheringTestCases
index 9df4342..abf381f 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsTetheringTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTetheringTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsTetheringTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsTetheringTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsTetheringTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsTetheringTestCases',
+        tag='9.0_r1.GtsTetheringTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsTetheringTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTetheringTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsTv b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTv
similarity index 91%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsTv
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsTv
index 0f4e90b..1d9f9cc 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsTv
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsTv
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsTv'
+NAME = 'cheets_GTS.9.0_r1.GtsTv'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsTv',
-        test_name='cheets_GTS.8.0_r4.GtsTv',
+        tag='9.0_r1.GtsTv',
+        test_name='cheets_GTS.9.0_r1.GtsTv',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsTvBugReportTestCases', '--include-filter', 'GtsTvHostTestCases', '--include-filter', 'GtsTvTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsUnofficialApisUsageTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsUnofficialApisUsageTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsUnofficialApisUsageTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsUnofficialApisUsageTestCases
index 6f1462d..605c7b8 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsUnofficialApisUsageTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsUnofficialApisUsageTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsUnofficialApisUsageTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsUnofficialApisUsageTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsUnofficialApisUsageTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsUnofficialApisUsageTestCases',
+        tag='9.0_r1.GtsUnofficialApisUsageTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsUnofficialApisUsageTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUnofficialApisUsageTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsUsageStatsTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsUsageStatsTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsUsageStatsTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsUsageStatsTestCases
index df37bf2..74457c7 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsUsageStatsTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsUsageStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsUsageStatsTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsUsageStatsTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsUsageStatsTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsUsageStatsTestCases',
+        tag='9.0_r1.GtsUsageStatsTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsUsageStatsTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUsageStatsTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsUserspaceRebootHostSideTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsUserspaceRebootHostSideTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsUserspaceRebootHostSideTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsUserspaceRebootHostSideTestCases
index 2c23265..68c835a 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsUserspaceRebootHostSideTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsUserspaceRebootHostSideTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsUserspaceRebootHostSideTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsUserspaceRebootHostSideTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsUserspaceRebootHostSideTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsUserspaceRebootHostSideTestCases',
+        tag='9.0_r1.GtsUserspaceRebootHostSideTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsUserspaceRebootHostSideTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUserspaceRebootHostSideTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsViewTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsViewTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsViewTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsViewTestCases
index 63bfea4..2c6a845 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsViewTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsViewTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsViewTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsViewTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsViewTestCases',
+        tag='9.0_r1.GtsViewTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsViewTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsViewTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsVndkDependencyTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsVndkDependencyTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsVndkDependencyTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsVndkDependencyTestCases
index ee41977..789e6a1 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsVndkDependencyTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsVndkDependencyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsVndkDependencyTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsVndkDependencyTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsVndkDependencyTestCases',
-        test_name='cheets_GTS.8.0_r4.GtsVndkDependencyTestCases',
+        tag='9.0_r1.GtsVndkDependencyTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsVndkDependencyTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsVndkDependencyTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsWebView b/server/site_tests/cheets_GTS/control.9.0_r1.GtsWebView
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsWebView
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsWebView
index 51c8a9a..51bd1bd 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsWebView
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsWebView
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsWebView'
+NAME = 'cheets_GTS.9.0_r1.GtsWebView'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsWebView',
-        test_name='cheets_GTS.8.0_r4.GtsWebView',
+        tag='9.0_r1.GtsWebView',
+        test_name='cheets_GTS.9.0_r1.GtsWebView',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsWebViewHostTestCases', '--include-filter', 'GtsWebViewTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsWellbeing b/server/site_tests/cheets_GTS/control.9.0_r1.GtsWellbeing
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsWellbeing
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsWellbeing
index 3db3069..3ca736d 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsWellbeing
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsWellbeing
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsWellbeing'
+NAME = 'cheets_GTS.9.0_r1.GtsWellbeing'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r4.GtsWellbeing',
-        test_name='cheets_GTS.8.0_r4.GtsWellbeing',
+        tag='9.0_r1.GtsWellbeing',
+        test_name='cheets_GTS.9.0_r1.GtsWellbeing',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsWellbeingHostTestCases', '--include-filter', 'GtsWellbeingPermissionPolicyTestCases', '--include-filter', 'GtsWellbeingTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.GtsYouTubeTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.GtsYouTubeTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r4.GtsYouTubeTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.GtsYouTubeTestCases
index 7fa787c..d831f3c 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.GtsYouTubeTestCases
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.GtsYouTubeTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r4.GtsYouTubeTestCases'
+NAME = 'cheets_GTS.9.0_r1.GtsYouTubeTestCases'
 ATTRIBUTES = '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.8.0_r4.GtsYouTubeTestCases',
+        tag='9.0_r1.GtsYouTubeTestCases',
+        test_name='cheets_GTS.9.0_r1.GtsYouTubeTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsYouTubeTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases
new file mode 100644
index 0000000..a5d2f70
--- /dev/null
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases
@@ -0,0 +1,35 @@
+# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_GTS.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases'
+ATTRIBUTES = 'suite:arc-gts-qual'
+DEPENDENCIES = 'arc'
+JOB_RETRIES = 1
+TEST_TYPE = 'server'
+TIME = 'MEDIUM'
+MAX_RESULT_SIZE_KB = 307200
+DOC = 'Run module CtsEdiHostTestCases, CtsEdiHostTestCases[secondary_user], GtsAccountsHostTestCases, GtsAdminTestCases, GtsAfwTestCases, GtsAndroidAutoDeviceTestCases, GtsAppBlacklistDeviceTestCases, GtsAppTestCases, GtsAppVisibilityDeviceTestCases, GtsArtManagerHostTestCases, GtsAssistIntentTestCases, GtsAssistantHostTestCases, GtsAssistantMicHostTestCases, GtsAssistantWorkProfileHostTestCases, GtsAudioTestCases, GtsBackupHostTestCases, GtsBackupTestCases, GtsBootHealthHostTestCases, GtsBootStatsTestCases, GtsCNGCoreTestCases, GtsCalendarTests, GtsCallLogTestCases, GtsCameraTestCases, GtsCastHostTestCases, GtsContactsAppDeviceTestCases, GtsContactsTest, GtsContentHostTestCases, GtsContentTestCases, GtsContextHubPermissionDeviceTestCases, GtsDebugfsMountTestCases, GtsDeviceConfigTestCases, GtsDevicePolicyHostTestCases, GtsDevicePolicyTestCases, GtsDevicePolicyTestCases[secondary_user], GtsDexModuleRegistrationTestCases, GtsDialerAudioTestCases, GtsDialerDeviceTestCases, GtsDozeDeviceTestCases, GtsDozeHostSideTestCases, GtsDuoReadyTestCases, GtsEdiHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+
+def run_TS(machine):
+    host_list = [hosts.create_host(machine)]
+    job.run_test(
+        'cheets_GTS',
+        hosts=host_list,
+        iterations=1,
+        max_retry=9,
+        tag='9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases',
+        test_name='cheets_GTS.9.0_r1.all.CtsEdiHostTestCases_-_GtsEdiHostTestCases',
+        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
+        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'CtsEdiHostTestCases', '--include-filter', 'CtsEdiHostTestCases[secondary_user]', '--include-filter', 'GtsAccountsHostTestCases', '--include-filter', 'GtsAdminTestCases', '--include-filter', 'GtsAfwTestCases', '--include-filter', 'GtsAndroidAutoDeviceTestCases', '--include-filter', 'GtsAppBlacklistDeviceTestCases', '--include-filter', 'GtsAppTestCases', '--include-filter', 'GtsAppVisibilityDeviceTestCases', '--include-filter', 'GtsArtManagerHostTestCases', '--include-filter', 'GtsAssistIntentTestCases', '--include-filter', 'GtsAssistantHostTestCases', '--include-filter', 'GtsAssistantMicHostTestCases', '--include-filter', 'GtsAssistantWorkProfileHostTestCases', '--include-filter', 'GtsAudioTestCases', '--include-filter', 'GtsBackupHostTestCases', '--include-filter', 'GtsBackupTestCases', '--include-filter', 'GtsBootHealthHostTestCases', '--include-filter', 'GtsBootStatsTestCases', '--include-filter', 'GtsCNGCoreTestCases', '--include-filter', 'GtsCalendarTests', '--include-filter', 'GtsCallLogTestCases', '--include-filter', 'GtsCameraTestCases', '--include-filter', 'GtsCastHostTestCases', '--include-filter', 'GtsContactsAppDeviceTestCases', '--include-filter', 'GtsContactsTest', '--include-filter', 'GtsContentHostTestCases', '--include-filter', 'GtsContentTestCases', '--include-filter', 'GtsContextHubPermissionDeviceTestCases', '--include-filter', 'GtsDebugfsMountTestCases', '--include-filter', 'GtsDeviceConfigTestCases', '--include-filter', 'GtsDevicePolicyHostTestCases', '--include-filter', 'GtsDevicePolicyTestCases', '--include-filter', 'GtsDevicePolicyTestCases[secondary_user]', '--include-filter', 'GtsDexModuleRegistrationTestCases', '--include-filter', 'GtsDialerAudioTestCases', '--include-filter', 'GtsDialerDeviceTestCases', '--include-filter', 'GtsDozeDeviceTestCases', '--include-filter', 'GtsDozeHostSideTestCases', '--include-filter', 'GtsDuoReadyTestCases', '--include-filter', 'GtsEdiHostTestCases', '--ignore-business-logic-failure'],
+        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        target_module='all.CtsEdiHostTestCases_-_GtsEdiHostTestCases',
+        target_plan=None,
+        uri='LATEST',
+        use_jdk9=True,
+        timeout=86400)
+
+parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases
new file mode 100644
index 0000000..39df75d
--- /dev/null
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases
@@ -0,0 +1,36 @@
+# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_GTS.9.0_r1.all.GtsExoPlayerTestCases_-_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',
+        hosts=host_list,
+        iterations=1,
+        max_retry=9,
+        tag='9.0_r1.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases',
+        test_name='cheets_GTS.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/control.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases
rename to server/site_tests/cheets_GTS/control.9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases
index 4ac5c32..1440a29 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases
+++ b/server/site_tests/cheets_GTS/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.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases'
+NAME = 'cheets_GTS.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.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases',
+        tag='9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases',
+        test_name='cheets_GTS.9.0_r1.all.GtsMediaTestCases_-_GtsMediaTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
diff --git a/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases b/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases
new file mode 100644
index 0000000..90fefd2
--- /dev/null
+++ b/server/site_tests/cheets_GTS/control.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases
@@ -0,0 +1,36 @@
+# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_GTS.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases'
+ATTRIBUTES = 'suite:arc-gts-qual'
+DEPENDENCIES = 'arc'
+JOB_RETRIES = 1
+TEST_TYPE = 'server'
+TIME = 'MEDIUM'
+MAX_RESULT_SIZE_KB = 307200
+DOC = 'Run module GtsMemoryHostTestCases, GtsMemoryTestCases, GtsModuleMetadataTestCases, GtsNetStatsHostTestCases, GtsNetTestCases, GtsNetworkStackHostTestCases, GtsNetworkWatchlistTestCases, GtsNmgiarcTestCases, GtsNoPermissionTestCases, GtsNoPermissionTestCases25, GtsNotificationTestCases, GtsOemLockServiceTestCases, GtsOsTestCases, GtsPackageInstallTestCases, GtsPackageInstallerTapjackingTestCases, GtsPackageManagerHostTestCases, GtsPackageNameCertPairsDeviceTestCases, GtsPackageRoleEnforcementTests, GtsPackageUninstallTestCases, GtsPartnerBookmarksTestCases, GtsPermissionControllerHostTestCases, GtsPermissionTestCases, GtsPlacementTestCases, GtsPlayAutoInstallTestCases, GtsPlayFsiHostTestCases, GtsPlayFsiTestCases, GtsPlayStoreHostTestCases, GtsPrintTestCases, GtsPrivacyTestCases, GtsPropertiesTestCases, GtsRegulationComplianceTestCases, GtsRlzTestCases, GtsRollbackManagerTest, GtsSampleDeviceTestCases, GtsSampleDynamicConfigTestCases, GtsSampleHostTestCases, GtsScreenshotHostTestCases, GtsSearchHostTestCases, GtsSecurityHostTestCases, GtsSensorHostTestCases, GtsSettingsHostTestCases, GtsSettingsTestCases, GtsSetupWizardHostTestCases, GtsSetupWizardNoPermissionTestCases, GtsSimAppDialogTestCases, GtsSmartBatteryDeviceTestCases, GtsSmsCallLogTestCases, GtsSpeechServicesTestCases, GtsSsaidHostTestCases, GtsStagedInstallHostTestCases, GtsStatsdHostTestCases, GtsStorageTestCases, GtsSupervisionTestCases, GtsSuspendAppsPermissionTestCases, GtsSuspendAppsTestCases, GtsTelecomManagerTests, GtsTelephonyNumberVerificationHostCases, GtsTelephonyTestCases, GtsTestHarnessModeTestCases, GtsTetheringTestCases, GtsTvBugReportTestCases, GtsTvHostTestCases, GtsTvTestCases, GtsUnofficialApisUsageTestCases, GtsUsageStatsTestCases, GtsUserspaceRebootHostSideTestCases, GtsViewTestCases, GtsVndkDependencyTestCases, GtsWebViewHostTestCases, GtsWebViewTestCases, GtsWellbeingHostTestCases, GtsWellbeingPermissionPolicyTestCases, GtsWellbeingTestCases, GtsYouTubeTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+
+def run_TS(machine):
+    host_list = [hosts.create_host(machine)]
+    job.run_test(
+        'cheets_GTS',
+        hosts=host_list,
+        iterations=1,
+        max_retry=9,
+        needs_push_media=True,
+        tag='9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases',
+        test_name='cheets_GTS.9.0_r1.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases',
+        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
+        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsMemoryHostTestCases', '--include-filter', 'GtsMemoryTestCases', '--include-filter', 'GtsModuleMetadataTestCases', '--include-filter', 'GtsNetStatsHostTestCases', '--include-filter', 'GtsNetTestCases', '--include-filter', 'GtsNetworkStackHostTestCases', '--include-filter', 'GtsNetworkWatchlistTestCases', '--include-filter', 'GtsNmgiarcTestCases', '--include-filter', 'GtsNoPermissionTestCases', '--include-filter', 'GtsNoPermissionTestCases25', '--include-filter', 'GtsNotificationTestCases', '--include-filter', 'GtsOemLockServiceTestCases', '--include-filter', 'GtsOsTestCases', '--include-filter', 'GtsPackageInstallTestCases', '--include-filter', 'GtsPackageInstallerTapjackingTestCases', '--include-filter', 'GtsPackageManagerHostTestCases', '--include-filter', 'GtsPackageNameCertPairsDeviceTestCases', '--include-filter', 'GtsPackageRoleEnforcementTests', '--include-filter', 'GtsPackageUninstallTestCases', '--include-filter', 'GtsPartnerBookmarksTestCases', '--include-filter', 'GtsPermissionControllerHostTestCases', '--include-filter', 'GtsPermissionTestCases', '--include-filter', 'GtsPlacementTestCases', '--include-filter', 'GtsPlayAutoInstallTestCases', '--include-filter', 'GtsPlayFsiHostTestCases', '--include-filter', 'GtsPlayFsiTestCases', '--include-filter', 'GtsPlayStoreHostTestCases', '--include-filter', 'GtsPrintTestCases', '--include-filter', 'GtsPrivacyTestCases', '--include-filter', 'GtsPropertiesTestCases', '--include-filter', 'GtsRegulationComplianceTestCases', '--include-filter', 'GtsRlzTestCases', '--include-filter', 'GtsRollbackManagerTest', '--include-filter', 'GtsSampleDeviceTestCases', '--include-filter', 'GtsSampleDynamicConfigTestCases', '--include-filter', 'GtsSampleHostTestCases', '--include-filter', 'GtsScreenshotHostTestCases', '--include-filter', 'GtsSearchHostTestCases', '--include-filter', 'GtsSecurityHostTestCases', '--include-filter', 'GtsSensorHostTestCases', '--include-filter', 'GtsSettingsHostTestCases', '--include-filter', 'GtsSettingsTestCases', '--include-filter', 'GtsSetupWizardHostTestCases', '--include-filter', 'GtsSetupWizardNoPermissionTestCases', '--include-filter', 'GtsSimAppDialogTestCases', '--include-filter', 'GtsSmartBatteryDeviceTestCases', '--include-filter', 'GtsSmsCallLogTestCases', '--include-filter', 'GtsSpeechServicesTestCases', '--include-filter', 'GtsSsaidHostTestCases', '--include-filter', 'GtsStagedInstallHostTestCases', '--include-filter', 'GtsStatsdHostTestCases', '--include-filter', 'GtsStorageTestCases', '--include-filter', 'GtsSupervisionTestCases', '--include-filter', 'GtsSuspendAppsPermissionTestCases', '--include-filter', 'GtsSuspendAppsTestCases', '--include-filter', 'GtsTelecomManagerTests', '--include-filter', 'GtsTelephonyNumberVerificationHostCases', '--include-filter', 'GtsTelephonyTestCases', '--include-filter', 'GtsTestHarnessModeTestCases', '--include-filter', 'GtsTetheringTestCases', '--include-filter', 'GtsTvBugReportTestCases', '--include-filter', 'GtsTvHostTestCases', '--include-filter', 'GtsTvTestCases', '--include-filter', 'GtsUnofficialApisUsageTestCases', '--include-filter', 'GtsUsageStatsTestCases', '--include-filter', 'GtsUserspaceRebootHostSideTestCases', '--include-filter', 'GtsViewTestCases', '--include-filter', 'GtsVndkDependencyTestCases', '--include-filter', 'GtsWebViewHostTestCases', '--include-filter', 'GtsWebViewTestCases', '--include-filter', 'GtsWellbeingHostTestCases', '--include-filter', 'GtsWellbeingPermissionPolicyTestCases', '--include-filter', 'GtsWellbeingTestCases', '--include-filter', 'GtsYouTubeTestCases', '--ignore-business-logic-failure'],
+        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        target_module='all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases',
+        target_plan=None,
+        uri='LATEST',
+        use_jdk9=True,
+        timeout=86400)
+
+parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.8.0_r4.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_GTS/control.9.0_r1.tradefed-run-collect-tests-only-internal
similarity index 73%
rename from server/site_tests/cheets_GTS/control.8.0_r4.tradefed-run-collect-tests-only-internal
rename to server/site_tests/cheets_GTS/control.9.0_r1.tradefed-run-collect-tests-only-internal
index ed50813..892b628 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r4.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_GTS/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.8.0_r4.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_GTS.9.0_r1.tradefed-run-collect-tests-only-internal'
 ATTRIBUTES = 'suite:arc-gts, suite:arc-gts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -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.8.0_r4.tradefed-run-collect-tests-only-internal',
+        tag='9.0_r1.tradefed-run-collect-tests-only-internal',
+        test_name='cheets_GTS.9.0_r1.tradefed-run-collect-tests-only-internal',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'GtsYouTubeTestCases:skip-media-download:true'],
         retry_template=None,
@@ -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=[1837, 3674, 5511, 7348],
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS/control.CtsEdiHostTestCases
similarity index 70%
copy from server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS/control.CtsEdiHostTestCases
index a509225..5a97bbd 100644
--- a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS/control.CtsEdiHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsInstallerV2TestCases'
+NAME = 'cheets_GTS.CtsEdiHostTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module 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.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        tag='CtsEdiHostTestCases',
+        test_name='cheets_GTS.CtsEdiHostTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'CtsEdiHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallerV2TestCases',
+        target_module='CtsEdiHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS/control.GtsCalendarTests
similarity index 70%
copy from server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS/control.GtsCalendarTests
index a509225..2b60864 100644
--- a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS/control.GtsCalendarTests
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsInstallerV2TestCases'
+NAME = 'cheets_GTS.GtsCalendarTests'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module 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.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        tag='GtsCalendarTests',
+        test_name='cheets_GTS.GtsCalendarTests',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCalendarTests', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallerV2TestCases',
+        target_module='GtsCalendarTests',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS/control.GtsDevicePolicyHostTestCases
similarity index 69%
copy from server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS/control.GtsDevicePolicyHostTestCases
index a509225..2004a13 100644
--- a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS/control.GtsDevicePolicyHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsInstallerV2TestCases'
+NAME = 'cheets_GTS.GtsDevicePolicyHostTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module 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.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        tag='GtsDevicePolicyHostTestCases',
+        test_name='cheets_GTS.GtsDevicePolicyHostTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDevicePolicyHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallerV2TestCases',
+        target_module='GtsDevicePolicyHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS/control.GtsDevicePolicyTestCases
similarity index 70%
copy from server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS/control.GtsDevicePolicyTestCases
index a509225..9db66be 100644
--- a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS/control.GtsDevicePolicyTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsInstallerV2TestCases'
+NAME = 'cheets_GTS.GtsDevicePolicyTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module 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.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        tag='GtsDevicePolicyTestCases',
+        test_name='cheets_GTS.GtsDevicePolicyTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDevicePolicyTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallerV2TestCases',
+        target_module='GtsDevicePolicyTestCases',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS/control.GtsFilesByGoogleTestCases
similarity index 70%
copy from server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS/control.GtsFilesByGoogleTestCases
index a509225..98b935b 100644
--- a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS/control.GtsFilesByGoogleTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsInstallerV2TestCases'
+NAME = 'cheets_GTS.GtsFilesByGoogleTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module 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.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        tag='GtsFilesByGoogleTestCases',
+        test_name='cheets_GTS.GtsFilesByGoogleTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFilesByGoogleTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallerV2TestCases',
+        target_module='GtsFilesByGoogleTestCases',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS/control.GtsFontHostTestCases
similarity index 70%
copy from server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS/control.GtsFontHostTestCases
index a509225..965a62a 100644
--- a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS/control.GtsFontHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsInstallerV2TestCases'
+NAME = 'cheets_GTS.GtsFontHostTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module 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.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        tag='GtsFontHostTestCases',
+        test_name='cheets_GTS.GtsFontHostTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFontHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallerV2TestCases',
+        target_module='GtsFontHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS/control.GtsGameOverlayTestCases
similarity index 74%
rename from server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
rename to server/site_tests/cheets_GTS/control.GtsGameOverlayTestCases
index a509225..f4a505c 100644
--- a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS/control.GtsGameOverlayTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsInstallerV2TestCases'
+NAME = 'cheets_GTS.GtsGameOverlayTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module 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.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        tag='GtsGameOverlayTestCases',
+        test_name='cheets_GTS.GtsGameOverlayTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameOverlayTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallerV2TestCases',
+        target_module='GtsGameOverlayTestCases',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTriggerApp b/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTriggerApp
deleted file mode 100644
index 3b43def..0000000
--- a/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTriggerApp
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.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',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsIncrementalInstallTriggerApp',
-        test_name='cheets_GTS.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/control.GtsIncrementalInstallTriggerApp_BackgroundProcess b/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTriggerApp_BackgroundProcess
deleted file mode 100644
index 89da43c..0000000
--- a/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTriggerApp_BackgroundProcess
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.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',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsIncrementalInstallTriggerApp_BackgroundProcess',
-        test_name='cheets_GTS.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/control.GtsInstallerV2TestCases_BackgroundProcess b/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases_BackgroundProcess
deleted file mode 100644
index 0f8a732..0000000
--- a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases_BackgroundProcess
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.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',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsInstallerV2TestCases_BackgroundProcess',
-        test_name='cheets_GTS.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/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS/control.GtsPackageRoleEnforcementTests
similarity index 68%
copy from server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS/control.GtsPackageRoleEnforcementTests
index a509225..6ea6831 100644
--- a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageRoleEnforcementTests
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsInstallerV2TestCases'
+NAME = 'cheets_GTS.GtsPackageRoleEnforcementTests'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module 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.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        tag='GtsPackageRoleEnforcementTests',
+        test_name='cheets_GTS.GtsPackageRoleEnforcementTests',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPackageRoleEnforcementTests', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallerV2TestCases',
+        target_module='GtsPackageRoleEnforcementTests',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases b/server/site_tests/cheets_GTS/control.GtsSpeechServicesTestCases
similarity index 69%
copy from server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
copy to server/site_tests/cheets_GTS/control.GtsSpeechServicesTestCases
index a509225..967401c 100644
--- a/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSpeechServicesTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsInstallerV2TestCases'
+NAME = 'cheets_GTS.GtsSpeechServicesTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module 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.GtsInstallerV2TestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
+        tag='GtsSpeechServicesTestCases',
+        test_name='cheets_GTS.GtsSpeechServicesTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSpeechServicesTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsInstallerV2TestCases',
+        target_module='GtsSpeechServicesTestCases',
         target_plan=None,
         retry_manual_tests=True,
         use_jdk9=True,
diff --git a/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only b/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only
index 72d5ccb..3cfa012 100644
--- a/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only
+++ b/server/site_tests/cheets_GTS/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=[1837, 3674, 5511, 7348],
         timeout=3600)
 
 parallel_simple(run_TS, machines)