diff --git a/server/site_tests/cheets_GTS/cheets_GTS.py b/server/site_tests/cheets_GTS/cheets_GTS.py
index f7b25e2..4688d53 100644
--- a/server/site_tests/cheets_GTS/cheets_GTS.py
+++ b/server/site_tests/cheets_GTS/cheets_GTS.py
@@ -23,7 +23,7 @@
 # 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-R3-7133222.zip'
+_PARTNER_GTS_LOCATION = _PARTNER_GTS_BUCKET + 'gts-8-R4-7380330.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')
diff --git a/server/site_tests/cheets_GTS/control.8.0_dev.waivers b/server/site_tests/cheets_GTS/control.8.0_dev.waivers
deleted file mode 100644
index dfecbcc..0000000
--- a/server/site_tests/cheets_GTS/control.8.0_dev.waivers
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_dev.waivers'
-ATTRIBUTES = 'suite:arc-gts, suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run waived testcases of the Android Google Test Suite (GTS) 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_dev.waivers',
-        test_name='cheets_GTS.8.0_dev.waivers',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--subplan', 'waivers', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='gts-dev',
-        target_plan='waivers',
-        load_waivers=False,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-Preview3-7012566.zip',
-        use_jdk9=True,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsJniUncompressTestCases b/server/site_tests/cheets_GTS/control.8.0_r3.GtsJniUncompressTestCases
deleted file mode 100644
index ea16222..0000000
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsJniUncompressTestCases
+++ /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_r3.GtsJniUncompressTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsJniUncompressTestCases of the Android Google Test Suite (GTS) 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_r3.GtsJniUncompressTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsJniUncompressTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsJniUncompressTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsJniUncompressTestCases',
-        target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
-        use_jdk9=True,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases b/server/site_tests/cheets_GTS/control.8.0_r3.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases
deleted file mode 100644
index f23a8e6..0000000
--- a/server/site_tests/cheets_GTS/control.8.0_r3.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_r3.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, 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_r3.all.GtsMemoryHostTestCases_-_GtsYouTubeTestCases',
-        test_name='cheets_GTS.8.0_r3.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', '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='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
-        use_jdk9=True,
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsAccountsHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsAccountsHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsAccountsHostTestCases
index edf030d..6d13d65 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAccountsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsAccountsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsAccountsHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsAccountsHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsAccountsHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsAccountsHostTestCases',
+        tag='8.0_r4.GtsAccountsHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsAccountsHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAccountsHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsAccountsHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAdminTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsAdminTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsAdminTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsAdminTestCases
index 2c4a5fb..22f4b9c 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAdminTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsAdminTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsAdminTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsAdminTestCases'
 ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='8.0_r3.GtsAdminTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsAdminTestCases',
+        tag='8.0_r4.GtsAdminTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsAdminTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAdminTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsAdminTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAfwTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsAfwTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsAfwTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsAfwTestCases
index a098019..db4e267 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAfwTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsAfwTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsAfwTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsAfwTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsAfwTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsAfwTestCases',
+        tag='8.0_r4.GtsAfwTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsAfwTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAfwTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsAfwTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAndroidAutoDeviceTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsAndroidAutoDeviceTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsAndroidAutoDeviceTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsAndroidAutoDeviceTestCases
index 9d907fb..091c301 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAndroidAutoDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsAndroidAutoDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsAndroidAutoDeviceTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsAndroidAutoDeviceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsAndroidAutoDeviceTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsAndroidAutoDeviceTestCases',
+        tag='8.0_r4.GtsAndroidAutoDeviceTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsAndroidAutoDeviceTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAndroidAutoDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsAndroidAutoDeviceTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsApp b/server/site_tests/cheets_GTS/control.8.0_r4.GtsApp
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsApp
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsApp
index a64cadc..e5247bc 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsApp
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsApp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsApp'
+NAME = 'cheets_GTS.8.0_r4.GtsApp'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsApp',
-        test_name='cheets_GTS.8.0_r3.GtsApp',
+        tag='8.0_r4.GtsApp',
+        test_name='cheets_GTS.8.0_r4.GtsApp',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsAppBlacklistDeviceTestCases', '--include-filter', 'GtsAppTestCases', '--include-filter', 'GtsAppVisibilityDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsApp',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1440)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsArtManagerHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsArtManagerHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsArtManagerHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsArtManagerHostTestCases
index 138e79b..8744462 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsArtManagerHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsArtManagerHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsArtManagerHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsArtManagerHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsArtManagerHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsArtManagerHostTestCases',
+        tag='8.0_r4.GtsArtManagerHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsArtManagerHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsArtManagerHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsArtManagerHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAssistIntentTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsAssistIntentTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsAssistIntentTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsAssistIntentTestCases
index d7b4cfd..d6532c8 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAssistIntentTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsAssistIntentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsAssistIntentTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsAssistIntentTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsAssistIntentTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsAssistIntentTestCases',
+        tag='8.0_r4.GtsAssistIntentTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsAssistIntentTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAssistIntentTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsAssistIntentTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAssistant b/server/site_tests/cheets_GTS/control.8.0_r4.GtsAssistant
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsAssistant
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsAssistant
index 88e1492..b02dbda 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAssistant
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsAssistant
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsAssistant'
+NAME = 'cheets_GTS.8.0_r4.GtsAssistant'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,15 +20,15 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsAssistant',
-        test_name='cheets_GTS.8.0_r3.GtsAssistant',
+        tag='8.0_r4.GtsAssistant',
+        test_name='cheets_GTS.8.0_r4.GtsAssistant',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsAssistantHostTestCases', '--include-filter', 'GtsAssistantMicHostTestCases', '--include-filter', 'GtsAssistantWorkProfileHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsAssistant',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
-        timeout=2880)
+        timeout=1440)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAudioTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsAudioTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsAudioTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsAudioTestCases
index 28946e7..81e0f4a 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAudioTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsAudioTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsAudioTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsAudioTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsAudioTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsAudioTestCases',
+        tag='8.0_r4.GtsAudioTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsAudioTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAudioTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsAudioTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsBackup b/server/site_tests/cheets_GTS/control.8.0_r4.GtsBackup
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsBackup
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsBackup
index f4dc968..98d63c6 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsBackup
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsBackup
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsBackup'
+NAME = 'cheets_GTS.8.0_r4.GtsBackup'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsBackup',
-        test_name='cheets_GTS.8.0_r3.GtsBackup',
+        tag='8.0_r4.GtsBackup',
+        test_name='cheets_GTS.8.0_r4.GtsBackup',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsBackupHostTestCases', '--include-filter', 'GtsBackupTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsBackup',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsBoot b/server/site_tests/cheets_GTS/control.8.0_r4.GtsBoot
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsBoot
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsBoot
index 62a6c13..056a128 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsBoot
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsBoot
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsBoot'
+NAME = 'cheets_GTS.8.0_r4.GtsBoot'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsBoot',
-        test_name='cheets_GTS.8.0_r3.GtsBoot',
+        tag='8.0_r4.GtsBoot',
+        test_name='cheets_GTS.8.0_r4.GtsBoot',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsBootHealthHostTestCases', '--include-filter', 'GtsBootStatsTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsBoot',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsCNGCoreTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsCNGCoreTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsCNGCoreTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsCNGCoreTestCases
index f66edb8..c25a683 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsCNGCoreTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsCNGCoreTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsCNGCoreTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsCNGCoreTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsCNGCoreTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsCNGCoreTestCases',
+        tag='8.0_r4.GtsCNGCoreTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsCNGCoreTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCNGCoreTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsCNGCoreTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsCallLogTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsCallLogTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsCallLogTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsCallLogTestCases
index 3c9f8eb..d324f92 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsCallLogTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsCallLogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsCallLogTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsCallLogTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsCallLogTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsCallLogTestCases',
+        tag='8.0_r4.GtsCallLogTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsCallLogTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCallLogTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsCallLogTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsCameraTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsCameraTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsCameraTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsCameraTestCases
index f0255a2..27f546f 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsCameraTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsCameraTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsCameraTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsCameraTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsCameraTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsCameraTestCases',
+        tag='8.0_r4.GtsCameraTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsCameraTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCameraTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsCameraTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsCastHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsCastHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsCastHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsCastHostTestCases
index 77e2239..6911271 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsCastHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsCastHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsCastHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsCastHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsCastHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsCastHostTestCases',
+        tag='8.0_r4.GtsCastHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsCastHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsCastHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsCastHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsContacts b/server/site_tests/cheets_GTS/control.8.0_r4.GtsContacts
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsContacts
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsContacts
index 9a91c1f..f93e8eb 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsContacts
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsContacts
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsContacts'
+NAME = 'cheets_GTS.8.0_r4.GtsContacts'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsContacts',
-        test_name='cheets_GTS.8.0_r3.GtsContacts',
+        tag='8.0_r4.GtsContacts',
+        test_name='cheets_GTS.8.0_r4.GtsContacts',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsContactsAppDeviceTestCases', '--include-filter', 'GtsContactsTest', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsContacts',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsContent b/server/site_tests/cheets_GTS/control.8.0_r4.GtsContent
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsContent
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsContent
index fd7a0fd..5406294 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsContent
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsContent
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsContent'
+NAME = 'cheets_GTS.8.0_r4.GtsContent'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsContent',
-        test_name='cheets_GTS.8.0_r3.GtsContent',
+        tag='8.0_r4.GtsContent',
+        test_name='cheets_GTS.8.0_r4.GtsContent',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsContentHostTestCases', '--include-filter', 'GtsContentTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsContent',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsContextHubPermissionDeviceTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsContextHubPermissionDeviceTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsContextHubPermissionDeviceTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsContextHubPermissionDeviceTestCases
index bc61158..de560c9 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsContextHubPermissionDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsContextHubPermissionDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsContextHubPermissionDeviceTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsContextHubPermissionDeviceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsContextHubPermissionDeviceTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsContextHubPermissionDeviceTestCases',
+        tag='8.0_r4.GtsContextHubPermissionDeviceTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsContextHubPermissionDeviceTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContextHubPermissionDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsContextHubPermissionDeviceTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsDebugfsMountTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsDebugfsMountTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsDebugfsMountTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsDebugfsMountTestCases
index fe2b032..f53acca 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsDebugfsMountTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsDebugfsMountTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsDebugfsMountTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsDebugfsMountTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsDebugfsMountTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsDebugfsMountTestCases',
+        tag='8.0_r4.GtsDebugfsMountTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsDebugfsMountTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDebugfsMountTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsDebugfsMountTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsDeviceConfigTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsDeviceConfigTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsDeviceConfigTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsDeviceConfigTestCases
index 520ba2c..8ebfd9b 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsDeviceConfigTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsDeviceConfigTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsDeviceConfigTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsDeviceConfigTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsDeviceConfigTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsDeviceConfigTestCases',
+        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='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsDexModuleRegistrationTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsDexModuleRegistrationTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsDexModuleRegistrationTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsDexModuleRegistrationTestCases
index 76032e4..528a2f8 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsDexModuleRegistrationTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsDexModuleRegistrationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsDexModuleRegistrationTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsDexModuleRegistrationTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsDexModuleRegistrationTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsDexModuleRegistrationTestCases',
+        tag='8.0_r4.GtsDexModuleRegistrationTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsDexModuleRegistrationTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDexModuleRegistrationTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsDexModuleRegistrationTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsDialer b/server/site_tests/cheets_GTS/control.8.0_r4.GtsDialer
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsDialer
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsDialer
index 6d9f8b7..a061409 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsDialer
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsDialer
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsDialer'
+NAME = 'cheets_GTS.8.0_r4.GtsDialer'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsDialer',
-        test_name='cheets_GTS.8.0_r3.GtsDialer',
+        tag='8.0_r4.GtsDialer',
+        test_name='cheets_GTS.8.0_r4.GtsDialer',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsDialerAudioTestCases', '--include-filter', 'GtsDialerDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsDialer',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsDoze b/server/site_tests/cheets_GTS/control.8.0_r4.GtsDoze
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsDoze
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsDoze
index d26a13a..422e0e0 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsDoze
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsDoze
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsDoze'
+NAME = 'cheets_GTS.8.0_r4.GtsDoze'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsDoze',
-        test_name='cheets_GTS.8.0_r3.GtsDoze',
+        tag='8.0_r4.GtsDoze',
+        test_name='cheets_GTS.8.0_r4.GtsDoze',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsDozeDeviceTestCases', '--include-filter', 'GtsDozeHostSideTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsDoze',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsDuoReadyTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsDuoReadyTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsDuoReadyTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsDuoReadyTestCases
index 8f958b7..a1783fa 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsDuoReadyTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsDuoReadyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsDuoReadyTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsDuoReadyTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsDuoReadyTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsDuoReadyTestCases',
+        tag='8.0_r4.GtsDuoReadyTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsDuoReadyTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDuoReadyTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsDuoReadyTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsEdiHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsEdiHostTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsEdiHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsEdiHostTestCases
index 06863e6..30a7117 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsEdiHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsEdiHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsEdiHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsEdiHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsEdiHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsEdiHostTestCases',
+        tag='8.0_r4.GtsEdiHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsEdiHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsEdiHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsEdiHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsExoPlayerTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsExoPlayerTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsExoPlayerTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsExoPlayerTestCases
index ca104cb..6cccb46 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsExoPlayerTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsExoPlayerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsExoPlayerTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsExoPlayerTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsExoPlayerTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsExoPlayerTestCases',
+        tag='8.0_r4.GtsExoPlayerTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsExoPlayerTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsExoPlayerTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsExoPlayerTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=5400)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsFeaturesTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsFeaturesTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsFeaturesTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsFeaturesTestCases
index 13001f2..63b2d11 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsFeaturesTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsFeaturesTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsFeaturesTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsFeaturesTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsFeaturesTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsFeaturesTestCases',
+        tag='8.0_r4.GtsFeaturesTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsFeaturesTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsFeaturesTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsFeaturesTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsGmscoreHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsGmscoreHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsGmscoreHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsGmscoreHostTestCases
index f02c9ed..461e364 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsGmscoreHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsGmscoreHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsGmscoreHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsGmscoreHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsGmscoreHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsGmscoreHostTestCases',
+        tag='8.0_r4.GtsGmscoreHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsGmscoreHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGmscoreHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsGmscoreHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         prerequisites=['bluetooth'],
         use_jdk9=True,
         timeout=3600)
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsGraphicsHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsGraphicsHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsGraphicsHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsGraphicsHostTestCases
index 8dcf428..43e827e 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsGraphicsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsGraphicsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsGraphicsHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsGraphicsHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsGraphicsHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsGraphicsHostTestCases',
+        tag='8.0_r4.GtsGraphicsHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsGraphicsHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGraphicsHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsGraphicsHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsHomeHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsHomeHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsHomeHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsHomeHostTestCases
index 036064d..a13ccee 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsHomeHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsHomeHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsHomeHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsHomeHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsHomeHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsHomeHostTestCases',
+        tag='8.0_r4.GtsHomeHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsHomeHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsHomeHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsHomeHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsIncident b/server/site_tests/cheets_GTS/control.8.0_r4.GtsIncident
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsIncident
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsIncident
index b9c5deb..23fcb3a 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsIncident
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsIncident
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsIncident'
+NAME = 'cheets_GTS.8.0_r4.GtsIncident'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsIncident',
-        test_name='cheets_GTS.8.0_r3.GtsIncident',
+        tag='8.0_r4.GtsIncident',
+        test_name='cheets_GTS.8.0_r4.GtsIncident',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsIncidentConfirmationTestCases', '--include-filter', 'GtsIncidentManagerTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsIncident',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsIncrementalInstall b/server/site_tests/cheets_GTS/control.8.0_r4.GtsIncrementalInstall
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsIncrementalInstall
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsIncrementalInstall
index 12c759c..f5e3499 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsIncrementalInstall
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsIncrementalInstall
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsIncrementalInstall'
+NAME = 'cheets_GTS.8.0_r4.GtsIncrementalInstall'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsIncrementalInstall',
-        test_name='cheets_GTS.8.0_r3.GtsIncrementalInstall',
+        tag='8.0_r4.GtsIncrementalInstall',
+        test_name='cheets_GTS.8.0_r4.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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsIncrementalInstall',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=2160)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsInstallPackagesWhitelistDeviceTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsInstallPackagesWhitelistDeviceTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases
index a7623a7..d92cb89 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsInstallPackagesWhitelistDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsInstallPackagesWhitelistDeviceTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsInstallPackagesWhitelistDeviceTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsInstallPackagesWhitelistDeviceTestCases',
+        tag='8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsInstallPackagesWhitelistDeviceTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallPackagesWhitelistDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsInstallPackagesWhitelistDeviceTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsInstallerV2 b/server/site_tests/cheets_GTS/control.8.0_r4.GtsInstallerV2
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsInstallerV2
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsInstallerV2
index 3f8c8fc..731bcf9 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsInstallerV2
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsInstallerV2
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsInstallerV2'
+NAME = 'cheets_GTS.8.0_r4.GtsInstallerV2'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsInstallerV2',
-        test_name='cheets_GTS.8.0_r3.GtsInstallerV2',
+        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='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsInstantAppsHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsInstantAppsHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsInstantAppsHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsInstantAppsHostTestCases
index b112951..7605e79 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsInstantAppsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsInstantAppsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsInstantAppsHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsInstantAppsHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsInstantAppsHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsInstantAppsHostTestCases',
+        tag='8.0_r4.GtsInstantAppsHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsInstantAppsHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstantAppsHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsInstantAppsHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAndroidAutoDeviceTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsJniUncompressHostTestCases
similarity index 72%
copy from server/site_tests/cheets_GTS/control.8.0_r3.GtsAndroidAutoDeviceTestCases
copy to server/site_tests/cheets_GTS/control.8.0_r4.GtsJniUncompressHostTestCases
index 9d907fb..5f36396 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsAndroidAutoDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsJniUncompressHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsAndroidAutoDeviceTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsJniUncompressHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAndroidAutoDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsJniUncompressHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsAndroidAutoDeviceTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsAndroidAutoDeviceTestCases',
+        tag='8.0_r4.GtsJniUncompressHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsJniUncompressHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAndroidAutoDeviceTestCases', '--ignore-business-logic-failure'],
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsJniUncompressHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAndroidAutoDeviceTestCases',
+        target_module='GtsJniUncompressHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsDebugfsMountTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsKidsHomeHostTestCases
similarity index 72%
copy from server/site_tests/cheets_GTS/control.8.0_r3.GtsDebugfsMountTestCases
copy to server/site_tests/cheets_GTS/control.8.0_r4.GtsKidsHomeHostTestCases
index fe2b032..0ab6b00 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsDebugfsMountTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsKidsHomeHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsDebugfsMountTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsKidsHomeHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsDebugfsMountTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsKidsHomeHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsDebugfsMountTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsDebugfsMountTestCases',
+        tag='8.0_r4.GtsKidsHomeHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsKidsHomeHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDebugfsMountTestCases', '--ignore-business-logic-failure'],
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsKidsHomeHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsDebugfsMountTestCases',
+        target_module='GtsKidsHomeHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsLargeApkHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsLargeApkHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsLargeApkHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsLargeApkHostTestCases
index e2e5cbd..9a82c7c 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsLargeApkHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsLargeApkHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsLargeApkHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsLargeApkHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsLargeApkHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsLargeApkHostTestCases',
+        tag='8.0_r4.GtsLargeApkHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsLargeApkHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLargeApkHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsLargeApkHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsLensTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsLensTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsLensTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsLensTestCases
index e5b18cd..b598d0c 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsLensTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsLensTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsLensTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsLensTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsLensTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsLensTestCases',
+        tag='8.0_r4.GtsLensTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsLensTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLensTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsLensTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsLinkerConfig b/server/site_tests/cheets_GTS/control.8.0_r4.GtsLinkerConfig
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsLinkerConfig
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsLinkerConfig
index 9ad898f..761f1f3 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsLinkerConfig
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsLinkerConfig
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsLinkerConfig'
+NAME = 'cheets_GTS.8.0_r4.GtsLinkerConfig'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsLinkerConfig',
-        test_name='cheets_GTS.8.0_r3.GtsLinkerConfig',
+        tag='8.0_r4.GtsLinkerConfig',
+        test_name='cheets_GTS.8.0_r4.GtsLinkerConfig',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsLinkerConfigTestCases', '--include-filter', 'GtsLinkerConfigTestCases[secondary_user]', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsLinkerConfig',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsLocation b/server/site_tests/cheets_GTS/control.8.0_r4.GtsLocation
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsLocation
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsLocation
index 468aa4f..cf20843 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsLocation
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsLocation
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsLocation'
+NAME = 'cheets_GTS.8.0_r4.GtsLocation'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsLocation',
-        test_name='cheets_GTS.8.0_r3.GtsLocation',
+        tag='8.0_r4.GtsLocation',
+        test_name='cheets_GTS.8.0_r4.GtsLocation',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsLocationHostTestCases', '--include-filter', 'GtsLocationTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsLocation',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsUserspaceRebootHostSideTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsMbaPrivilegedPermissionTestCases
similarity index 71%
copy from server/site_tests/cheets_GTS/control.8.0_r3.GtsUserspaceRebootHostSideTestCases
copy to server/site_tests/cheets_GTS/control.8.0_r4.GtsMbaPrivilegedPermissionTestCases
index 7c55182..47b3f5b 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsUserspaceRebootHostSideTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsMbaPrivilegedPermissionTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsUserspaceRebootHostSideTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsMbaPrivilegedPermissionTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsUserspaceRebootHostSideTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsMbaPrivilegedPermissionTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsUserspaceRebootHostSideTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsUserspaceRebootHostSideTestCases',
+        tag='8.0_r4.GtsMbaPrivilegedPermissionTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsMbaPrivilegedPermissionTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUserspaceRebootHostSideTestCases', '--ignore-business-logic-failure'],
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMbaPrivilegedPermissionTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsUserspaceRebootHostSideTestCases',
+        target_module='GtsMbaPrivilegedPermissionTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsMediaTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsMediaTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsMediaTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsMediaTestCases
index 3386d8e..1bedb3a 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsMediaTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsMediaTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsMediaTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsMediaTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsMediaTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsMediaTestCases',
+        tag='8.0_r4.GtsMediaTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsMediaTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsMediaTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=14400)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsMemory b/server/site_tests/cheets_GTS/control.8.0_r4.GtsMemory
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsMemory
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsMemory
index cca7c17..f359dd6 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsMemory
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsMemory
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsMemory'
+NAME = 'cheets_GTS.8.0_r4.GtsMemory'
 ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='8.0_r3.GtsMemory',
-        test_name='cheets_GTS.8.0_r3.GtsMemory',
+        tag='8.0_r4.GtsMemory',
+        test_name='cheets_GTS.8.0_r4.GtsMemory',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsMemoryHostTestCases', '--include-filter', 'GtsMemoryTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsMemory',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsModuleMetadataTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsModuleMetadataTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsModuleMetadataTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsModuleMetadataTestCases
index 69360e7..d91b34e 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsModuleMetadataTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsModuleMetadataTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsModuleMetadataTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsModuleMetadataTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsModuleMetadataTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsModuleMetadataTestCases',
+        tag='8.0_r4.GtsModuleMetadataTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsModuleMetadataTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsModuleMetadataTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsModuleMetadataTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsNet b/server/site_tests/cheets_GTS/control.8.0_r4.GtsNet
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsNet
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsNet
index dc5b714..8d88f2a 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsNet
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsNet
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsNet'
+NAME = 'cheets_GTS.8.0_r4.GtsNet'
 ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='8.0_r3.GtsNet',
-        test_name='cheets_GTS.8.0_r3.GtsNet',
+        tag='8.0_r4.GtsNet',
+        test_name='cheets_GTS.8.0_r4.GtsNet',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsNetStatsHostTestCases', '--include-filter', 'GtsNetTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsNet',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsNetwork b/server/site_tests/cheets_GTS/control.8.0_r4.GtsNetwork
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsNetwork
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsNetwork
index 7014b68..3ea7cdb 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsNetwork
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsNetwork
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsNetwork'
+NAME = 'cheets_GTS.8.0_r4.GtsNetwork'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,15 +20,15 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsNetwork',
-        test_name='cheets_GTS.8.0_r3.GtsNetwork',
+        tag='8.0_r4.GtsNetwork',
+        test_name='cheets_GTS.8.0_r4.GtsNetwork',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsNetworkStackHostTestCases', '--include-filter', 'GtsNetworkWatchlistTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsNetwork',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
-        timeout=4320)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsNmgiarcTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsNmgiarcTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsNmgiarcTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsNmgiarcTestCases
index fdf5817..0813b52 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsNmgiarcTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsNmgiarcTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsNmgiarcTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsNmgiarcTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsNmgiarcTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsNmgiarcTestCases',
+        tag='8.0_r4.GtsNmgiarcTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsNmgiarcTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNmgiarcTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsNmgiarcTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsNoPermission b/server/site_tests/cheets_GTS/control.8.0_r4.GtsNoPermission
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsNoPermission
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsNoPermission
index 8abaa35..334144a 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsNoPermission
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsNoPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsNoPermission'
+NAME = 'cheets_GTS.8.0_r4.GtsNoPermission'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsNoPermission',
-        test_name='cheets_GTS.8.0_r3.GtsNoPermission',
+        tag='8.0_r4.GtsNoPermission',
+        test_name='cheets_GTS.8.0_r4.GtsNoPermission',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsNoPermissionTestCases', '--include-filter', 'GtsNoPermissionTestCases25', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsNoPermission',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsNotificationTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsNotificationTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsNotificationTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsNotificationTestCases
index 62bd1e4..a4a1abc 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsNotificationTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsNotificationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsNotificationTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsNotificationTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsNotificationTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsNotificationTestCases',
+        tag='8.0_r4.GtsNotificationTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsNotificationTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsNotificationTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsNotificationTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsOemLockServiceTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsOemLockServiceTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsOemLockServiceTestCases
index 297e766..b76c3c3 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsOemLockServiceTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsOemLockServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsOemLockServiceTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsOemLockServiceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsOemLockServiceTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsOemLockServiceTestCases',
+        tag='8.0_r4.GtsOemLockServiceTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsOemLockServiceTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsOemLockServiceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsOemLockServiceTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsOsTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsOsTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsOsTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsOsTestCases
index bdff37c..1de331d 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsOsTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsOsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsOsTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsOsTestCases'
 ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='8.0_r3.GtsOsTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsOsTestCases',
+        tag='8.0_r4.GtsOsTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsOsTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsOsTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsOsTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPackage b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPackage
similarity index 91%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsPackage
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsPackage
index b982783..635c27b 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPackage
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPackage
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsPackage'
+NAME = 'cheets_GTS.8.0_r4.GtsPackage'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsPackage',
-        test_name='cheets_GTS.8.0_r3.GtsPackage',
+        tag='8.0_r4.GtsPackage',
+        test_name='cheets_GTS.8.0_r4.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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsPackage',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=2160)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPartnerBookmarksTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPartnerBookmarksTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsPartnerBookmarksTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsPartnerBookmarksTestCases
index c6fc6cb..2d03eec 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPartnerBookmarksTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPartnerBookmarksTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsPartnerBookmarksTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsPartnerBookmarksTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsPartnerBookmarksTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsPartnerBookmarksTestCases',
+        tag='8.0_r4.GtsPartnerBookmarksTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsPartnerBookmarksTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPartnerBookmarksTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsPartnerBookmarksTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPermission b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPermission
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsPermission
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsPermission
index b07b082..eb97844 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPermission
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsPermission'
+NAME = 'cheets_GTS.8.0_r4.GtsPermission'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsPermission',
-        test_name='cheets_GTS.8.0_r3.GtsPermission',
+        tag='8.0_r4.GtsPermission',
+        test_name='cheets_GTS.8.0_r4.GtsPermission',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsPermissionControllerHostTestCases', '--include-filter', 'GtsPermissionTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsPermission',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPlacementTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPlacementTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsPlacementTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsPlacementTestCases
index 3ea5183..2c9bd3a 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPlacementTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPlacementTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsPlacementTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsPlacementTestCases'
 ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='8.0_r3.GtsPlacementTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsPlacementTestCases',
+        tag='8.0_r4.GtsPlacementTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsPlacementTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlacementTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsPlacementTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPlay b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPlay
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsPlay
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsPlay
index 3fb6277..3aab50f 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPlay
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPlay
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsPlay'
+NAME = 'cheets_GTS.8.0_r4.GtsPlay'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsPlay',
-        test_name='cheets_GTS.8.0_r3.GtsPlay',
+        tag='8.0_r4.GtsPlay',
+        test_name='cheets_GTS.8.0_r4.GtsPlay',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsPlayAutoInstallTestCases', '--include-filter', 'GtsPlayFsiHostTestCases', '--include-filter', 'GtsPlayFsiTestCases', '--include-filter', 'GtsPlayStoreHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsPlay',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1800)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPrintTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPrintTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsPrintTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsPrintTestCases
index 8418a8a..cd079de 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPrintTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPrintTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsPrintTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsPrintTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsPrintTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsPrintTestCases',
+        tag='8.0_r4.GtsPrintTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsPrintTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrintTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsPrintTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPrivacyTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPrivacyTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsPrivacyTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsPrivacyTestCases
index a8439ce..fca4d13 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPrivacyTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPrivacyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsPrivacyTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsPrivacyTestCases'
 ATTRIBUTES = 'suite:arc-gts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='8.0_r3.GtsPrivacyTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsPrivacyTestCases',
+        tag='8.0_r4.GtsPrivacyTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsPrivacyTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrivacyTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsPrivacyTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPropertiesTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPropertiesTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsPropertiesTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsPropertiesTestCases
index 3487648..42a3ba6 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsPropertiesTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsPropertiesTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsPropertiesTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsPropertiesTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsPropertiesTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsPropertiesTestCases',
+        tag='8.0_r4.GtsPropertiesTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsPropertiesTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPropertiesTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsPropertiesTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsRegulationComplianceTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsRegulationComplianceTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsRegulationComplianceTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsRegulationComplianceTestCases
index 963cb42..982d74d 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsRegulationComplianceTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsRegulationComplianceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsRegulationComplianceTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsRegulationComplianceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsRegulationComplianceTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsRegulationComplianceTestCases',
+        tag='8.0_r4.GtsRegulationComplianceTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsRegulationComplianceTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRegulationComplianceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsRegulationComplianceTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsRlzTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsRlzTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsRlzTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsRlzTestCases
index ca8b185..53386e6 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsRlzTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsRlzTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsRlzTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsRlzTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsRlzTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsRlzTestCases',
+        tag='8.0_r4.GtsRlzTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsRlzTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRlzTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsRlzTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSensorHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsRollbackManagerTest
similarity index 73%
copy from server/site_tests/cheets_GTS/control.8.0_r3.GtsSensorHostTestCases
copy to server/site_tests/cheets_GTS/control.8.0_r4.GtsRollbackManagerTest
index 657fd07..026e14b 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSensorHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsRollbackManagerTest
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsSensorHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsRollbackManagerTest'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSensorHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsRollbackManagerTest of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsSensorHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsSensorHostTestCases',
+        tag='8.0_r4.GtsRollbackManagerTest',
+        test_name='cheets_GTS.8.0_r4.GtsRollbackManagerTest',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSensorHostTestCases', '--ignore-business-logic-failure'],
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsRollbackManagerTest', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSensorHostTestCases',
+        target_module='GtsRollbackManagerTest',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSample b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSample
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsSample
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsSample
index d45b756..b960603 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSample
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSample
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsSample'
+NAME = 'cheets_GTS.8.0_r4.GtsSample'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsSample',
-        test_name='cheets_GTS.8.0_r3.GtsSample',
+        tag='8.0_r4.GtsSample',
+        test_name='cheets_GTS.8.0_r4.GtsSample',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSampleDeviceTestCases', '--include-filter', 'GtsSampleDynamicConfigTestCases', '--include-filter', 'GtsSampleHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsSample',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1440)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsScreenshotHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsScreenshotHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsScreenshotHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsScreenshotHostTestCases
index f86b55d..90859e9 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsScreenshotHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsScreenshotHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsScreenshotHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsScreenshotHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsScreenshotHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsScreenshotHostTestCases',
+        tag='8.0_r4.GtsScreenshotHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsScreenshotHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsScreenshotHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsScreenshotHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSearchHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSearchHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsSearchHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsSearchHostTestCases
index b2740c8..67a66e1 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSearchHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSearchHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsSearchHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsSearchHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsSearchHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsSearchHostTestCases',
+        tag='8.0_r4.GtsSearchHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsSearchHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSearchHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsSearchHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSecurityHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSecurityHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsSecurityHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsSecurityHostTestCases
index b52cca7..ceeb2ff 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSecurityHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSecurityHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsSecurityHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsSecurityHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsSecurityHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsSecurityHostTestCases',
+        tag='8.0_r4.GtsSecurityHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsSecurityHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSecurityHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsSecurityHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSensorHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSensorHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsSensorHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsSensorHostTestCases
index 657fd07..d90cdf9 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSensorHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSensorHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsSensorHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsSensorHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsSensorHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsSensorHostTestCases',
+        tag='8.0_r4.GtsSensorHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsSensorHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSensorHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsSensorHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSettings b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSettings
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsSettings
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsSettings
index addf2e6..2bdcb52 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSettings
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSettings
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsSettings'
+NAME = 'cheets_GTS.8.0_r4.GtsSettings'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsSettings',
-        test_name='cheets_GTS.8.0_r3.GtsSettings',
+        tag='8.0_r4.GtsSettings',
+        test_name='cheets_GTS.8.0_r4.GtsSettings',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSettingsHostTestCases', '--include-filter', 'GtsSettingsTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsSettings',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSetupWizard b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSetupWizard
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsSetupWizard
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsSetupWizard
index c501a26..8f0c64a 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSetupWizard
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSetupWizard
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsSetupWizard'
+NAME = 'cheets_GTS.8.0_r4.GtsSetupWizard'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsSetupWizard',
-        test_name='cheets_GTS.8.0_r3.GtsSetupWizard',
+        tag='8.0_r4.GtsSetupWizard',
+        test_name='cheets_GTS.8.0_r4.GtsSetupWizard',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSetupWizardHostTestCases', '--include-filter', 'GtsSetupWizardNoPermissionTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsSetupWizard',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSimAppDialogTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSimAppDialogTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsSimAppDialogTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsSimAppDialogTestCases
index 07791e5..fbd08d6 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSimAppDialogTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSimAppDialogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsSimAppDialogTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsSimAppDialogTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsSimAppDialogTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsSimAppDialogTestCases',
+        tag='8.0_r4.GtsSimAppDialogTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsSimAppDialogTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSimAppDialogTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsSimAppDialogTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSmartBatteryDeviceTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSmartBatteryDeviceTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsSmartBatteryDeviceTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsSmartBatteryDeviceTestCases
index 73dd56a..0619f7c 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSmartBatteryDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSmartBatteryDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsSmartBatteryDeviceTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsSmartBatteryDeviceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsSmartBatteryDeviceTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsSmartBatteryDeviceTestCases',
+        tag='8.0_r4.GtsSmartBatteryDeviceTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsSmartBatteryDeviceTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSmartBatteryDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsSmartBatteryDeviceTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSmsCallLogTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSmsCallLogTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsSmsCallLogTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsSmsCallLogTestCases
index 82a8358..a9377a0 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSmsCallLogTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSmsCallLogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsSmsCallLogTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsSmsCallLogTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsSmsCallLogTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsSmsCallLogTestCases',
+        tag='8.0_r4.GtsSmsCallLogTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsSmsCallLogTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSmsCallLogTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsSmsCallLogTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSsaidHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSsaidHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsSsaidHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsSsaidHostTestCases
index f42f2bc..b680a9c 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSsaidHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSsaidHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsSsaidHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsSsaidHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsSsaidHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsSsaidHostTestCases',
+        tag='8.0_r4.GtsSsaidHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsSsaidHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSsaidHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsSsaidHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsStagedInstallHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsStagedInstallHostTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsStagedInstallHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsStagedInstallHostTestCases
index ab33f09..b6ddcac 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsStagedInstallHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsStagedInstallHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsStagedInstallHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsStagedInstallHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsStagedInstallHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsStagedInstallHostTestCases',
+        tag='8.0_r4.GtsStagedInstallHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsStagedInstallHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStagedInstallHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsStagedInstallHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsStatsdHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsStatsdHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsStatsdHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsStatsdHostTestCases
index a13626d..200f534 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsStatsdHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsStatsdHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsStatsdHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsStatsdHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsStatsdHostTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsStatsdHostTestCases',
+        tag='8.0_r4.GtsStatsdHostTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsStatsdHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStatsdHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsStatsdHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsStorageTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsStorageTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsStorageTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsStorageTestCases
index e991909..7d0761e 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsStorageTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsStorageTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsStorageTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsStorageTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsStorageTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsStorageTestCases',
+        tag='8.0_r4.GtsStorageTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsStorageTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsStorageTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsStorageTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSupervisionTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSupervisionTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsSupervisionTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsSupervisionTestCases
index 15f8c23..7110fb9 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSupervisionTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSupervisionTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsSupervisionTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsSupervisionTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsSupervisionTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsSupervisionTestCases',
+        tag='8.0_r4.GtsSupervisionTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsSupervisionTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSupervisionTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsSupervisionTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSuspendApps b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSuspendApps
similarity index 88%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsSuspendApps
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsSuspendApps
index 28367e8..21a344d 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsSuspendApps
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsSuspendApps
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsSuspendApps'
+NAME = 'cheets_GTS.8.0_r4.GtsSuspendApps'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsSuspendApps',
-        test_name='cheets_GTS.8.0_r3.GtsSuspendApps',
+        tag='8.0_r4.GtsSuspendApps',
+        test_name='cheets_GTS.8.0_r4.GtsSuspendApps',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSuspendAppsPermissionTestCases', '--include-filter', 'GtsSuspendAppsTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsSuspendApps',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsTelecomManagerTests b/server/site_tests/cheets_GTS/control.8.0_r4.GtsTelecomManagerTests
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsTelecomManagerTests
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsTelecomManagerTests
index a8a334f..fb4d388 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsTelecomManagerTests
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsTelecomManagerTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsTelecomManagerTests'
+NAME = 'cheets_GTS.8.0_r4.GtsTelecomManagerTests'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsTelecomManagerTests',
-        test_name='cheets_GTS.8.0_r3.GtsTelecomManagerTests',
+        tag='8.0_r4.GtsTelecomManagerTests',
+        test_name='cheets_GTS.8.0_r4.GtsTelecomManagerTests',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTelecomManagerTests', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsTelecomManagerTests',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsTelephony b/server/site_tests/cheets_GTS/control.8.0_r4.GtsTelephony
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsTelephony
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsTelephony
index 3d09dd5..471e153 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsTelephony
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsTelephony
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsTelephony'
+NAME = 'cheets_GTS.8.0_r4.GtsTelephony'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsTelephony',
-        test_name='cheets_GTS.8.0_r3.GtsTelephony',
+        tag='8.0_r4.GtsTelephony',
+        test_name='cheets_GTS.8.0_r4.GtsTelephony',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsTelephonyNumberVerificationHostCases', '--include-filter', 'GtsTelephonyTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsTelephony',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsTestHarnessModeTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsTestHarnessModeTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsTestHarnessModeTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsTestHarnessModeTestCases
index bc3daaa..1f1ff9a 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsTestHarnessModeTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsTestHarnessModeTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsTestHarnessModeTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsTestHarnessModeTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsTestHarnessModeTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsTestHarnessModeTestCases',
+        tag='8.0_r4.GtsTestHarnessModeTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsTestHarnessModeTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTestHarnessModeTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsTestHarnessModeTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsTetheringTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsTetheringTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsTetheringTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsTetheringTestCases
index 29aa306..ef2b8d9 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsTetheringTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsTetheringTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsTetheringTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsTetheringTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsTetheringTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsTetheringTestCases',
+        tag='8.0_r4.GtsTetheringTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsTetheringTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTetheringTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsTetheringTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsTv b/server/site_tests/cheets_GTS/control.8.0_r4.GtsTv
similarity index 90%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsTv
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsTv
index a28f4ed..770d546 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsTv
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsTv
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsTv'
+NAME = 'cheets_GTS.8.0_r4.GtsTv'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsTv',
-        test_name='cheets_GTS.8.0_r3.GtsTv',
+        tag='8.0_r4.GtsTv',
+        test_name='cheets_GTS.8.0_r4.GtsTv',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsTvBugReportTestCases', '--include-filter', 'GtsTvHostTestCases', '--include-filter', 'GtsTvTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsTv',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1440)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsUnofficialApisUsageTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsUnofficialApisUsageTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsUnofficialApisUsageTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsUnofficialApisUsageTestCases
index 6e2eb5d..f206f73 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsUnofficialApisUsageTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsUnofficialApisUsageTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsUnofficialApisUsageTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsUnofficialApisUsageTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsUnofficialApisUsageTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsUnofficialApisUsageTestCases',
+        tag='8.0_r4.GtsUnofficialApisUsageTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsUnofficialApisUsageTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUnofficialApisUsageTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsUnofficialApisUsageTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsUsageStatsTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsUsageStatsTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsUsageStatsTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsUsageStatsTestCases
index 5fe4d30..26159aa 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsUsageStatsTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsUsageStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsUsageStatsTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsUsageStatsTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsUsageStatsTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsUsageStatsTestCases',
+        tag='8.0_r4.GtsUsageStatsTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsUsageStatsTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUsageStatsTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsUsageStatsTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsUserspaceRebootHostSideTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsUserspaceRebootHostSideTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsUserspaceRebootHostSideTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsUserspaceRebootHostSideTestCases
index 7c55182..b968f5d 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsUserspaceRebootHostSideTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsUserspaceRebootHostSideTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsUserspaceRebootHostSideTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsUserspaceRebootHostSideTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsUserspaceRebootHostSideTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsUserspaceRebootHostSideTestCases',
+        tag='8.0_r4.GtsUserspaceRebootHostSideTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsUserspaceRebootHostSideTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUserspaceRebootHostSideTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsUserspaceRebootHostSideTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsViewTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsViewTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsViewTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsViewTestCases
index 0bad927..c0dc574 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsViewTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsViewTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsViewTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsViewTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsViewTestCases',
+        tag='8.0_r4.GtsViewTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsViewTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsViewTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsViewTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsVndkDependencyTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsVndkDependencyTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsVndkDependencyTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsVndkDependencyTestCases
index 8f05c09..5cb0615 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsVndkDependencyTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsVndkDependencyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsVndkDependencyTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsVndkDependencyTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsVndkDependencyTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsVndkDependencyTestCases',
+        tag='8.0_r4.GtsVndkDependencyTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsVndkDependencyTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsVndkDependencyTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsVndkDependencyTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsWebView b/server/site_tests/cheets_GTS/control.8.0_r4.GtsWebView
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsWebView
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsWebView
index b6d7ea9..a8fda22 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsWebView
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsWebView
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsWebView'
+NAME = 'cheets_GTS.8.0_r4.GtsWebView'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsWebView',
-        test_name='cheets_GTS.8.0_r3.GtsWebView',
+        tag='8.0_r4.GtsWebView',
+        test_name='cheets_GTS.8.0_r4.GtsWebView',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsWebViewHostTestCases', '--include-filter', 'GtsWebViewTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsWebView',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1080)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsWellbeing b/server/site_tests/cheets_GTS/control.8.0_r4.GtsWellbeing
similarity index 89%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsWellbeing
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsWellbeing
index 0b10b99..cbfddd4 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsWellbeing
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsWellbeing
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsWellbeing'
+NAME = 'cheets_GTS.8.0_r4.GtsWellbeing'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='8.0_r3.GtsWellbeing',
-        test_name='cheets_GTS.8.0_r3.GtsWellbeing',
+        tag='8.0_r4.GtsWellbeing',
+        test_name='cheets_GTS.8.0_r4.GtsWellbeing',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsWellbeingHostTestCases', '--include-filter', 'GtsWellbeingPermissionPolicyTestCases', '--include-filter', 'GtsWellbeingTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsWellbeing',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=1440)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.GtsYouTubeTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.GtsYouTubeTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.8.0_r3.GtsYouTubeTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.GtsYouTubeTestCases
index a45451e..37196b2 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.GtsYouTubeTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.GtsYouTubeTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.GtsYouTubeTestCases'
+NAME = 'cheets_GTS.8.0_r4.GtsYouTubeTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='8.0_r3.GtsYouTubeTestCases',
-        test_name='cheets_GTS.8.0_r3.GtsYouTubeTestCases',
+        tag='8.0_r4.GtsYouTubeTestCases',
+        test_name='cheets_GTS.8.0_r4.GtsYouTubeTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsYouTubeTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsYouTubeTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=3600)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases
similarity index 94%
rename from server/site_tests/cheets_GTS/control.8.0_r3.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases
index a58f4d4..8e85c50 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases'
+NAME = 'cheets_GTS.8.0_r4.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases'
 ATTRIBUTES = 'suite:arc-gts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='8.0_r3.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases',
-        test_name='cheets_GTS.8.0_r3.all.GtsAccountsHostTestCases_-_GtsEdiHostTestCases',
+        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='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=86400)
 
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.all.GtsExoPlayerTestCases_-_GtsLocationTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases
similarity index 66%
rename from server/site_tests/cheets_GTS/control.8.0_r3.all.GtsExoPlayerTestCases_-_GtsLocationTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases
index 20f95bc..bbe6909 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.all.GtsExoPlayerTestCases_-_GtsLocationTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.all.GtsExoPlayerTestCases_-_GtsLocationTestCases'
+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, GtsJniUncompressTestCases, GtsLargeApkHostTestCases, GtsLensTestCases, GtsLinkerConfigTestCases, GtsLinkerConfigTestCases[secondary_user], GtsLocationHostTestCases, GtsLocationTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+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)]
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='8.0_r3.all.GtsExoPlayerTestCases_-_GtsLocationTestCases',
-        test_name='cheets_GTS.8.0_r3.all.GtsExoPlayerTestCases_-_GtsLocationTestCases',
+        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', 'GtsJniUncompressTestCases', '--include-filter', 'GtsLargeApkHostTestCases', '--include-filter', 'GtsLensTestCases', '--include-filter', 'GtsLinkerConfigTestCases', '--include-filter', 'GtsLinkerConfigTestCases[secondary_user]', '--include-filter', 'GtsLocationHostTestCases', '--include-filter', 'GtsLocationTestCases', '--ignore-business-logic-failure'],
+        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_-_GtsLocationTestCases',
+        target_module='all.GtsExoPlayerTestCases_-_GtsMbaPrivilegedPermissionTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         prerequisites=['bluetooth'],
         use_jdk9=True,
         timeout=86400)
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.all.GtsMediaTestCases_-_GtsMediaTestCases b/server/site_tests/cheets_GTS/control.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.8.0_r3.all.GtsMediaTestCases_-_GtsMediaTestCases
rename to server/site_tests/cheets_GTS/control.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases
index 35f17c0..42a6888 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.all.GtsMediaTestCases_-_GtsMediaTestCases
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.8.0_r3.all.GtsMediaTestCases_-_GtsMediaTestCases'
+NAME = 'cheets_GTS.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases'
 ATTRIBUTES = 'suite:arc-gts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='8.0_r3.all.GtsMediaTestCases_-_GtsMediaTestCases',
-        test_name='cheets_GTS.8.0_r3.all.GtsMediaTestCases_-_GtsMediaTestCases',
+        tag='8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases',
+        test_name='cheets_GTS.8.0_r4.all.GtsMediaTestCases_-_GtsMediaTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsMediaTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.GtsMediaTestCases_-_GtsMediaTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
         timeout=86400)
 
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
new file mode 100644
index 0000000..f1987d5
--- /dev/null
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.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.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='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
+        use_jdk9=True,
+        timeout=86400)
+
+parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.8.0_r3.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_GTS/control.8.0_r4.tradefed-run-collect-tests-only-internal
similarity index 77%
rename from server/site_tests/cheets_GTS/control.8.0_r3.tradefed-run-collect-tests-only-internal
rename to server/site_tests/cheets_GTS/control.8.0_r4.tradefed-run-collect-tests-only-internal
index 811e1d4..18abde7 100644
--- a/server/site_tests/cheets_GTS/control.8.0_r3.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_GTS/control.8.0_r4.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_r3.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_GTS.8.0_r4.tradefed-run-collect-tests-only-internal'
 ATTRIBUTES = 'suite:arc-gts, suite:arc-gts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -21,18 +21,18 @@
         hosts=host_list,
         iterations=1,
         max_retry=0,
-        tag='8.0_r3.tradefed-run-collect-tests-only-internal',
-        test_name='cheets_GTS.8.0_r3.tradefed-run-collect-tests-only-internal',
+        tag='8.0_r4.tradefed-run-collect-tests-only-internal',
+        test_name='cheets_GTS.8.0_r4.tradefed-run-collect-tests-only-internal',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'GtsYouTubeTestCases:skip-media-download:true'],
         retry_template=None,
         target_module=None,
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R3-P-7133222.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-8-R4-P-7380330.zip',
         use_jdk9=True,
-        # This module has a known crash bug (b/181176656). As long as the
+        # 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=[1802, 3604, 5406, 7208],
-        timeout=3600)
+        executable_test_count=[1837, 3674, 5511, 7348],
+        timeout=1800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only b/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only
index 0789d34..72d5ccb 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,9 @@
         retry_manual_tests=True,
         use_jdk9=True,
         warn_on_test_retry=False,
-        # This module has a known crash bug (b/181176656). As long as the
+        # 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=[1802, 3604, 5406, 7208],
+        executable_test_count=[1837, 3674, 5511, 7348],
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.waivers b/server/site_tests/cheets_GTS/control.waivers
deleted file mode 100644
index fb96823..0000000
--- a/server/site_tests/cheets_GTS/control.waivers
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.waivers'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run preview version of the Android Google Test Suite (GTS) 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='waivers',
-        test_name='cheets_GTS.waivers',
-        run_template=['run', 'commandAndExit', 'gts', '--subplan', 'waivers', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='gts-dev',
-        target_plan='waivers',
-        load_waivers=False,
-        uri='gs://chromeos-partner-gts/android-gts-8-R3-P-Preview3-7012566.zip',
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.waivers-collect-tests-only b/server/site_tests/cheets_GTS/control.waivers-collect-tests-only
deleted file mode 100644
index e3ee3ad..0000000
--- a/server/site_tests/cheets_GTS/control.waivers-collect-tests-only
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.waivers-collect-tests-only'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run preview version of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=0,
-        tag='waivers-collect-tests-only',
-        test_name='cheets_GTS.waivers-collect-tests-only',
-        run_template=['run', 'commandAndExit', 'collect-tests-only', '--subplan', 'waivers', '--ignore-business-logic-failure', '--disable-reboot'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='gts-dev-collect',
-        target_plan='waivers',
-        load_waivers=False,
-        uri='gs://chromeos-partner-gts/android-gts-8-R3-P-Preview3-7012566.zip',
-        use_jdk9=True,
-        warn_on_test_retry=False,
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/notest_modules/notest_modules.yaml b/server/site_tests/cheets_GTS/notest_modules/notest_modules.yaml
index 4c36880..290c21f 100644
--- a/server/site_tests/cheets_GTS/notest_modules/notest_modules.yaml
+++ b/server/site_tests/cheets_GTS/notest_modules/notest_modules.yaml
@@ -18,7 +18,9 @@
 GtsIncrementalInstallTriggerApp_BackgroundProcess: [all]
 GtsInstallerV2TestCases: [all]
 GtsInstallerV2TestCases_BackgroundProcess: [all]
+GtsJniUncompressHostTestCases: [all]
 GtsJniUncompressTestCases: [all]
+GtsKidsHomeHostTestCases: [all]
 GtsLensTestCases: [all]
 GtsMemoryHostTestCases: [all]
 GtsMemoryTestCases: [all]
@@ -28,6 +30,7 @@
 GtsPermissionControllerHostTestCases: [all]
 GtsPlayFsiHostTestCases: [all]
 GtsPlayFsiTestCases: [all]
+GtsRollbackManagerTest: [all]
 GtsSampleDeviceTestCases: [all]
 GtsSampleDynamicConfigTestCases: [all]
 GtsSampleHostTestCases: [all]
@@ -43,4 +46,4 @@
 GtsTvTestCases: [all]
 GtsUserspaceRebootHostSideTestCases: [all]
 GtsWellbeingHostTestCases: [all]
-GtsWellbeingTestCases: [all]
\ No newline at end of file
+GtsWellbeingTestCases: [all]
diff --git a/server/site_tests/cheets_GTS/subplans/waivers.xml b/server/site_tests/cheets_GTS/subplans/waivers.xml
deleted file mode 100644
index 6769b7f..0000000
--- a/server/site_tests/cheets_GTS/subplans/waivers.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no' ?>
-<SubPlan version="2.0">
-  <!--
-    Unless there's special reason, the entries can be removed only
-    when the DEV version bundle's provisional version number (like 9.0r13)
-    is incremented. Otherwise the computation for the canonical list
-    of test cases is confused. See b/151779432.
-  -->
-  <Entry include="GtsAssistantWorkProfileHostTestCases" />
-</SubPlan>
\ No newline at end of file