diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsLauncherHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r4.GtsLauncherHostTestCases
deleted file mode 100644
index c8238d7..0000000
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsLauncherHostTestCases
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsLauncherHostTestCases'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsLauncherHostTestCases of the Android Google Test Suite (GTS) 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='7.0_r4.GtsLauncherHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsLauncherHostTestCases',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLauncherHostTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsLauncherHostTestCases',
-        target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSecurity b/server/site_tests/cheets_GTS/control.7.0_r4.GtsSecurity
deleted file mode 100644
index 1094d83..0000000
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSecurity
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsSecurity'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsSecurityHostTestCases, GtsSecurityTestCases of the Android Google Test Suite (GTS) 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='7.0_r4.GtsSecurity',
-        test_name='cheets_GTS.7.0_r4.GtsSecurity',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsSecurityHostTestCases', '--include-filter', 'GtsSecurityTestCases', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsSecurity',
-        target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
-        timeout=1080)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.ReviewPermissionHelperGts b/server/site_tests/cheets_GTS/control.7.0_r4.ReviewPermissionHelperGts
deleted file mode 100644
index aa9a70f..0000000
--- a/server/site_tests/cheets_GTS/control.7.0_r4.ReviewPermissionHelperGts
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.ReviewPermissionHelperGts'
-ATTRIBUTES = 'suite:arc-gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module ReviewPermissionHelperGts of the Android Google Test Suite (GTS) 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='7.0_r4.ReviewPermissionHelperGts',
-        test_name='cheets_GTS.7.0_r4.ReviewPermissionHelperGts',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'ReviewPermissionHelperGts', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='ReviewPermissionHelperGts',
-        target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.all.GtsCameraTestCases_-_ReviewPermissionHelperGts b/server/site_tests/cheets_GTS/control.7.0_r4.all.GtsCameraTestCases_-_ReviewPermissionHelperGts
deleted file mode 100644
index d701f9f..0000000
--- a/server/site_tests/cheets_GTS/control.7.0_r4.all.GtsCameraTestCases_-_ReviewPermissionHelperGts
+++ /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.7.0_r4.all.GtsCameraTestCases_-_ReviewPermissionHelperGts'
-ATTRIBUTES = 'suite:arc-gts-qual'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'LONG'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsCameraTestCases, GtsCastHostTestCases, GtsContactsAppDeviceTestCases, GtsContactsTest, GtsContentTestCases, GtsDeviceConfigTestCases, GtsDexModuleRegistrationTestCases, GtsDialerDeviceTestCases, GtsDozeDeviceTestCases, GtsEdiHostTestCases, GtsExoPlayerTestCases, GtsFeaturesTestCases, GtsGameDeviceHostTestCases, GtsGmscoreHostTestCases, GtsGraphicsHostTestCases, GtsHomeHostTestCases, GtsIncidentConfirmationTestCases, GtsIncidentManagerTestCases, GtsInstallPackagesWhitelistDeviceTestCases, GtsInstantAppsHostTestCases, GtsLargeApkHostTestCases, GtsLauncherHostTestCases, GtsLocationHostTestCases, GtsLocationTestCases, GtsMediaTestCases, GtsMemoryHostTestCases, GtsMemoryTestCases, GtsModuleMetadataTestCases, GtsNetStatsHostTestCases, GtsNetTestCases, GtsNetworkStackHostTestCases, GtsNetworkWatchlistTestCases, GtsNmgiarcTestCases, GtsNoPermissionTestCases, GtsNoPermissionTestCases25, GtsNotificationTestCases, GtsOemLockServiceTestCases, GtsOsTestCases, GtsPackageInstallTestCases, GtsPackageInstallerTapjackingTestCases, GtsPackageManagerHostTestCases, GtsPackageNameCertPairsDeviceTestCases, GtsPackageUninstallTestCases, GtsPartnerBookmarksTestCases, GtsPermissionControllerHostTestCases, GtsPermissionTestCases, GtsPlacementTestCases, GtsPlayAutoInstallTestCases, GtsPlayStoreHostTestCases, GtsPrintTestCases, GtsPrivacyTestCases, GtsPrivilegedUpdatePreparer, GtsPropertiesTestCases, GtsRegulationComplianceTestCases, GtsRlzTestCases, GtsSampleDeviceTestCases, GtsSampleDynamicConfigTestCases, GtsSampleHostTestCases, GtsScreenshotHostTestCases, GtsSearchHostTestCases, GtsSecurityHostTestCases, GtsSecurityTestCases, GtsSensorHostTestCases, GtsSettingsHostTestCases, GtsSettingsTestCases, GtsSetupWizardHostTestCases, GtsSetupWizardNoPermissionTestCases, GtsSimAppDialogTestCases, GtsSmartBatteryDeviceTestCases, GtsSsaidHostTestCases, GtsStagedInstallHostTestCases, GtsStatsdHostTestCases, GtsStorageTestCases, GtsSupervisionTestCases, GtsSuspendAppsPermissionTestCases, GtsSuspendAppsTestCases, GtsTelecomManagerTests, GtsTelephonyTestCases, GtsTestHarnessModeTestCases, GtsTetheringTestCases, GtsTvBugReportTestCases, GtsTvHostTestCases, GtsTvTestCases, GtsUnofficialApisUsageTestCases, GtsUsageStatsTestCases, GtsViewTestCases, GtsWebViewHostTestCases, GtsWebViewTestCases, GtsWellbeingHostTestCases, GtsWellbeingPermissionPolicyTestCases, GtsWellbeingTestCases, GtsYouTubeTestCases, ReviewPermissionHelperGts of the Android Google Test Suite (GTS) 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='7.0_r4.all.GtsCameraTestCases_-_ReviewPermissionHelperGts',
-        test_name='cheets_GTS.7.0_r4.all.GtsCameraTestCases_-_ReviewPermissionHelperGts',
-        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsCameraTestCases', '--include-filter', 'GtsCastHostTestCases', '--include-filter', 'GtsContactsAppDeviceTestCases', '--include-filter', 'GtsContactsTest', '--include-filter', 'GtsContentTestCases', '--include-filter', 'GtsDeviceConfigTestCases', '--include-filter', 'GtsDexModuleRegistrationTestCases', '--include-filter', 'GtsDialerDeviceTestCases', '--include-filter', 'GtsDozeDeviceTestCases', '--include-filter', 'GtsEdiHostTestCases', '--include-filter', 'GtsExoPlayerTestCases', '--include-filter', 'GtsFeaturesTestCases', '--include-filter', 'GtsGameDeviceHostTestCases', '--include-filter', 'GtsGmscoreHostTestCases', '--include-filter', 'GtsGraphicsHostTestCases', '--include-filter', 'GtsHomeHostTestCases', '--include-filter', 'GtsIncidentConfirmationTestCases', '--include-filter', 'GtsIncidentManagerTestCases', '--include-filter', 'GtsInstallPackagesWhitelistDeviceTestCases', '--include-filter', 'GtsInstantAppsHostTestCases', '--include-filter', 'GtsLargeApkHostTestCases', '--include-filter', 'GtsLauncherHostTestCases', '--include-filter', 'GtsLocationHostTestCases', '--include-filter', 'GtsLocationTestCases', '--include-filter', 'GtsMediaTestCases', '--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', 'GtsPlayStoreHostTestCases', '--include-filter', 'GtsPrintTestCases', '--include-filter', 'GtsPrivacyTestCases', '--include-filter', 'GtsPrivilegedUpdatePreparer', '--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', 'GtsSecurityTestCases', '--include-filter', 'GtsSensorHostTestCases', '--include-filter', 'GtsSettingsHostTestCases', '--include-filter', 'GtsSettingsTestCases', '--include-filter', 'GtsSetupWizardHostTestCases', '--include-filter', 'GtsSetupWizardNoPermissionTestCases', '--include-filter', 'GtsSimAppDialogTestCases', '--include-filter', 'GtsSmartBatteryDeviceTestCases', '--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', 'GtsTelephonyTestCases', '--include-filter', 'GtsTestHarnessModeTestCases', '--include-filter', 'GtsTetheringTestCases', '--include-filter', 'GtsTvBugReportTestCases', '--include-filter', 'GtsTvHostTestCases', '--include-filter', 'GtsTvTestCases', '--include-filter', 'GtsUnofficialApisUsageTestCases', '--include-filter', 'GtsUsageStatsTestCases', '--include-filter', 'GtsViewTestCases', '--include-filter', 'GtsWebViewHostTestCases', '--include-filter', 'GtsWebViewTestCases', '--include-filter', 'GtsWellbeingHostTestCases', '--include-filter', 'GtsWellbeingPermissionPolicyTestCases', '--include-filter', 'GtsWellbeingTestCases', '--include-filter', 'GtsYouTubeTestCases', '--include-filter', 'ReviewPermissionHelperGts', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='all.GtsCameraTestCases_-_ReviewPermissionHelperGts',
-        target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
-        prerequisites=['bluetooth'],
-        timeout=86400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.CtsCheckpointTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.CtsCheckpointTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.CtsCheckpointTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.CtsCheckpointTestCases
index 71d7a59..9f273a2 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.CtsCheckpointTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.CtsCheckpointTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.CtsCheckpointTestCases'
+NAME = 'cheets_GTS.7.0_r5.CtsCheckpointTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.CtsCheckpointTestCases',
-        test_name='cheets_GTS.7.0_r4.CtsCheckpointTestCases',
+        tag='7.0_r5.CtsCheckpointTestCases',
+        test_name='cheets_GTS.7.0_r5.CtsCheckpointTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'CtsCheckpointTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsCheckpointTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsAccountsHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsAccountsHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsAccountsHostTestCases
index d2c1e1c..c3d25ac 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsAccountsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsAccountsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsAccountsHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsAccountsHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsAccountsHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsAccountsHostTestCases',
+        tag='7.0_r5.GtsAccountsHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsAdminTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsAdminTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsAdminTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsAdminTestCases
index 7eedf19..b3d3089 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsAdminTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsAdminTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsAdminTestCases'
+NAME = 'cheets_GTS.7.0_r5.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='7.0_r4.GtsAdminTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsAdminTestCases',
+        tag='7.0_r5.GtsAdminTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsAfwTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsAfwTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsAfwTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsAfwTestCases
index 1a608ed..4b87c10 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsAfwTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsAfwTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsAfwTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsAfwTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsAfwTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsAfwTestCases',
+        tag='7.0_r5.GtsAfwTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsAndroidAutoDeviceTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsAndroidAutoDeviceTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsAndroidAutoDeviceTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsAndroidAutoDeviceTestCases
index cc44bd5..2b9e3af 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsAndroidAutoDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsAndroidAutoDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsAndroidAutoDeviceTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsAndroidAutoDeviceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsAndroidAutoDeviceTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsAndroidAutoDeviceTestCases',
+        tag='7.0_r5.GtsAndroidAutoDeviceTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsApp b/server/site_tests/cheets_GTS/control.7.0_r5.GtsApp
similarity index 90%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsApp
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsApp
index 9a498bd..b879b61 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsApp
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsApp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsApp'
+NAME = 'cheets_GTS.7.0_r5.GtsApp'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsApp',
-        test_name='cheets_GTS.7.0_r4.GtsApp',
+        tag='7.0_r5.GtsApp',
+        test_name='cheets_GTS.7.0_r5.GtsApp',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsAppBlacklistDeviceTestCases', '--include-filter', 'GtsAppTestCases', '--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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsArtManagerHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsArtManagerHostTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsArtManagerHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsArtManagerHostTestCases
index 4660cb7..48c690f 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsArtManagerHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsArtManagerHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsArtManagerHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsArtManagerHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsArtManagerHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsArtManagerHostTestCases',
+        tag='7.0_r5.GtsArtManagerHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsAssistIntentTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsAssistIntentTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsAssistIntentTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsAssistIntentTestCases
index 56495ee..f74a4bb 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsAssistIntentTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsAssistIntentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsAssistIntentTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsAssistIntentTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsAssistIntentTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsAssistIntentTestCases',
+        tag='7.0_r5.GtsAssistIntentTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsAssistantHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsAssistantHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsAssistantHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsAssistantHostTestCases
index f277d40..84f4448 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsAssistantHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsAssistantHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsAssistantHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsAssistantHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsAssistantHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsAssistantHostTestCases',
+        tag='7.0_r5.GtsAssistantHostTestCases',
+        test_name='cheets_GTS.7.0_r5.GtsAssistantHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAssistantHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsAssistantHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsBackup b/server/site_tests/cheets_GTS/control.7.0_r5.GtsBackup
similarity index 89%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsBackup
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsBackup
index a8e00f3..72225cc 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsBackup
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsBackup
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsBackup'
+NAME = 'cheets_GTS.7.0_r5.GtsBackup'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsBackup',
-        test_name='cheets_GTS.7.0_r4.GtsBackup',
+        tag='7.0_r5.GtsBackup',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsBootStatsTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsBootStatsTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsBootStatsTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsBootStatsTestCases
index aa0ff27..bf1c867 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsBootStatsTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsBootStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsBootStatsTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsBootStatsTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsBootStatsTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsBootStatsTestCases',
+        tag='7.0_r5.GtsBootStatsTestCases',
+        test_name='cheets_GTS.7.0_r5.GtsBootStatsTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsBootStatsTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsBootStatsTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsCallLogTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsCallLogTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsCallLogTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsCallLogTestCases
index a55143c..6cbdc18 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsCallLogTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsCallLogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsCallLogTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsCallLogTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsCallLogTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsCallLogTestCases',
+        tag='7.0_r5.GtsCallLogTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsCameraTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsCameraTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsCameraTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsCameraTestCases
index d22edbf..bb3b85f 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsCameraTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsCameraTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsCameraTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsCameraTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsCameraTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsCameraTestCases',
+        tag='7.0_r5.GtsCameraTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsCastHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsCastHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsCastHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsCastHostTestCases
index 5f4325f..0bcc662 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsCastHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsCastHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsCastHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsCastHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsCastHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsCastHostTestCases',
+        tag='7.0_r5.GtsCastHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsContacts b/server/site_tests/cheets_GTS/control.7.0_r5.GtsContacts
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsContacts
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsContacts
index 0c99201..8705104 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsContacts
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsContacts
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsContacts'
+NAME = 'cheets_GTS.7.0_r5.GtsContacts'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,15 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        max_retry=3,
-        tag='7.0_r4.GtsContacts',
-        test_name='cheets_GTS.7.0_r4.GtsContacts',
+        tag='7.0_r5.GtsContacts',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
-        timeout=360)
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
+        timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsContentTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsContentTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsContentTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsContentTestCases
index 32f685e..dddddad 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsContentTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsContentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsContentTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsContentTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsContentTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsContentTestCases',
+        tag='7.0_r5.GtsContentTestCases',
+        test_name='cheets_GTS.7.0_r5.GtsContentTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContentTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsContentTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsDeviceConfigTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsDeviceConfigTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsDeviceConfigTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsDeviceConfigTestCases
index eb0f0ab..64d4cac 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsDeviceConfigTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsDeviceConfigTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsDeviceConfigTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsDeviceConfigTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsDeviceConfigTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsDeviceConfigTestCases',
+        tag='7.0_r5.GtsDeviceConfigTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsDexModuleRegistrationTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsDexModuleRegistrationTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsDexModuleRegistrationTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsDexModuleRegistrationTestCases
index a3a40d0..48b14c6 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsDexModuleRegistrationTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsDexModuleRegistrationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsDexModuleRegistrationTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsDexModuleRegistrationTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsDexModuleRegistrationTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsDexModuleRegistrationTestCases',
+        tag='7.0_r5.GtsDexModuleRegistrationTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsDialerDeviceTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsDialerDeviceTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsDialerDeviceTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsDialerDeviceTestCases
index 650aecc..b6bc660 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsDialerDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsDialerDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsDialerDeviceTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsDialerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsDialerDeviceTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsDialerDeviceTestCases',
+        tag='7.0_r5.GtsDialerDeviceTestCases',
+        test_name='cheets_GTS.7.0_r5.GtsDialerDeviceTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDialerDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsDialerDeviceTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsDozeDeviceTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsDozeDeviceTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsDozeDeviceTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsDozeDeviceTestCases
index c1d831e..f78338b 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsDozeDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsDozeDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsDozeDeviceTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsDozeDeviceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsDozeDeviceTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsDozeDeviceTestCases',
+        tag='7.0_r5.GtsDozeDeviceTestCases',
+        test_name='cheets_GTS.7.0_r5.GtsDozeDeviceTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDozeDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsDozeDeviceTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsEdiHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsEdiHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsEdiHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsEdiHostTestCases
index 1e371db..82674ba 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsEdiHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsEdiHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsEdiHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsEdiHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsEdiHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsEdiHostTestCases',
+        tag='7.0_r5.GtsEdiHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsExoPlayerTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsExoPlayerTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsExoPlayerTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsExoPlayerTestCases
index 0d591ce..fd3fbd2 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsExoPlayerTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsExoPlayerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsExoPlayerTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsExoPlayerTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsExoPlayerTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsExoPlayerTestCases',
+        tag='7.0_r5.GtsExoPlayerTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsFeaturesTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsFeaturesTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsFeaturesTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsFeaturesTestCases
index dc0c1d9..cb98160 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsFeaturesTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsFeaturesTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsFeaturesTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsFeaturesTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsFeaturesTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsFeaturesTestCases',
+        tag='7.0_r5.GtsFeaturesTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsGameDeviceHostTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsGameDeviceHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsGameDeviceHostTestCases
index 0d148a2..2fa90a6 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsGameDeviceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsGameDeviceHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsGameDeviceHostTestCases',
+        tag='7.0_r5.GtsGameDeviceHostTestCases',
+        test_name='cheets_GTS.7.0_r5.GtsGameDeviceHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsGameDeviceHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsGmscoreHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsGmscoreHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsGmscoreHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsGmscoreHostTestCases
index a652ff1..783406c 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsGmscoreHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsGmscoreHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsGmscoreHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsGmscoreHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsGmscoreHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsGmscoreHostTestCases',
+        tag='7.0_r5.GtsGmscoreHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         prerequisites=['bluetooth'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsGraphicsHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsGraphicsHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsGraphicsHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsGraphicsHostTestCases
index ab279e0..70c1d4a 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsGraphicsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsGraphicsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsGraphicsHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsGraphicsHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsGraphicsHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsGraphicsHostTestCases',
+        tag='7.0_r5.GtsGraphicsHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsHomeHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsHomeHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsHomeHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsHomeHostTestCases
index 262c47d..f4f627a 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsHomeHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsHomeHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsHomeHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsHomeHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsHomeHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsHomeHostTestCases',
+        tag='7.0_r5.GtsHomeHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsIncident b/server/site_tests/cheets_GTS/control.7.0_r5.GtsIncident
similarity index 89%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsIncident
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsIncident
index 4403a81..2561da5 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsIncident
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsIncident
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsIncident'
+NAME = 'cheets_GTS.7.0_r5.GtsIncident'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsIncident',
-        test_name='cheets_GTS.7.0_r4.GtsIncident',
+        tag='7.0_r5.GtsIncident',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsInstallPackagesWhitelistDeviceTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsInstallPackagesWhitelistDeviceTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsInstallPackagesWhitelistDeviceTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsInstallPackagesWhitelistDeviceTestCases
index da05a2f..3344c57 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsInstallPackagesWhitelistDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsInstallPackagesWhitelistDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsInstallPackagesWhitelistDeviceTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsInstallPackagesWhitelistDeviceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsInstallPackagesWhitelistDeviceTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsInstallPackagesWhitelistDeviceTestCases',
+        tag='7.0_r5.GtsInstallPackagesWhitelistDeviceTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsInstantAppsHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsInstantAppsHostTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsInstantAppsHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsInstantAppsHostTestCases
index d4ae01d..63565b6 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsInstantAppsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsInstantAppsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsInstantAppsHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsInstantAppsHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsInstantAppsHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsInstantAppsHostTestCases',
+        tag='7.0_r5.GtsInstantAppsHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsLargeApkHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsLargeApkHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsLargeApkHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsLargeApkHostTestCases
index c05e104..38e8fe0 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsLargeApkHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsLargeApkHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsLargeApkHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsLargeApkHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsLargeApkHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsLargeApkHostTestCases',
+        tag='7.0_r5.GtsLargeApkHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsLocation b/server/site_tests/cheets_GTS/control.7.0_r5.GtsLocation
similarity index 89%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsLocation
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsLocation
index 2bb93a0..bb44bcd 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsLocation
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsLocation
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsLocation'
+NAME = 'cheets_GTS.7.0_r5.GtsLocation'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsLocation',
-        test_name='cheets_GTS.7.0_r4.GtsLocation',
+        tag='7.0_r5.GtsLocation',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsMediaTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsMediaTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsMediaTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsMediaTestCases
index 9439471..edef9ee 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsMediaTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsMediaTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsMediaTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsMediaTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsMediaTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsMediaTestCases',
+        tag='7.0_r5.GtsMediaTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=14400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsMemory b/server/site_tests/cheets_GTS/control.7.0_r5.GtsMemory
similarity index 89%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsMemory
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsMemory
index 0fee9a0..8cd72cf 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsMemory
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsMemory
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsMemory'
+NAME = 'cheets_GTS.7.0_r5.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='7.0_r4.GtsMemory',
-        test_name='cheets_GTS.7.0_r4.GtsMemory',
+        tag='7.0_r5.GtsMemory',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsModuleMetadataTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsModuleMetadataTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsModuleMetadataTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsModuleMetadataTestCases
index c939e76..a29a31a 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsModuleMetadataTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsModuleMetadataTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsModuleMetadataTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsModuleMetadataTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsModuleMetadataTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsModuleMetadataTestCases',
+        tag='7.0_r5.GtsModuleMetadataTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsNet b/server/site_tests/cheets_GTS/control.7.0_r5.GtsNet
similarity index 90%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsNet
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsNet
index d48f59c..7480f67 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsNet
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsNet
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsNet'
+NAME = 'cheets_GTS.7.0_r5.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='7.0_r4.GtsNet',
-        test_name='cheets_GTS.7.0_r4.GtsNet',
+        tag='7.0_r5.GtsNet',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsNetwork b/server/site_tests/cheets_GTS/control.7.0_r5.GtsNetwork
similarity index 89%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsNetwork
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsNetwork
index d612fcc..6cabcaf 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsNetwork
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsNetwork
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsNetwork'
+NAME = 'cheets_GTS.7.0_r5.GtsNetwork'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsNetwork',
-        test_name='cheets_GTS.7.0_r4.GtsNetwork',
+        tag='7.0_r5.GtsNetwork',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsNmgiarcTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsNmgiarcTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsNmgiarcTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsNmgiarcTestCases
index e1af15a..5db5e4f 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsNmgiarcTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsNmgiarcTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsNmgiarcTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsNmgiarcTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsNmgiarcTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsNmgiarcTestCases',
+        tag='7.0_r5.GtsNmgiarcTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsNoPermission b/server/site_tests/cheets_GTS/control.7.0_r5.GtsNoPermission
similarity index 88%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsNoPermission
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsNoPermission
index 45d523c..0bf405f 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsNoPermission
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsNoPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsNoPermission'
+NAME = 'cheets_GTS.7.0_r5.GtsNoPermission'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsNoPermission',
-        test_name='cheets_GTS.7.0_r4.GtsNoPermission',
+        tag='7.0_r5.GtsNoPermission',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsNotificationTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsNotificationTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsNotificationTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsNotificationTestCases
index 68ef2a5..ee3ac5f 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsNotificationTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsNotificationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsNotificationTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsNotificationTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsNotificationTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsNotificationTestCases',
+        tag='7.0_r5.GtsNotificationTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsOemLockServiceTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsOemLockServiceTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsOemLockServiceTestCases
index c3184ff..0627cf0 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsOemLockServiceTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsOemLockServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsOemLockServiceTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsOemLockServiceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsOemLockServiceTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsOemLockServiceTestCases',
+        tag='7.0_r5.GtsOemLockServiceTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsOsTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsOsTestCases
similarity index 88%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsOsTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsOsTestCases
index e4bf140..0af021f 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsOsTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsOsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsOsTestCases'
+NAME = 'cheets_GTS.7.0_r5.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='7.0_r4.GtsOsTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsOsTestCases',
+        tag='7.0_r5.GtsOsTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPackage b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPackage
similarity index 91%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsPackage
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsPackage
index 81aa117..3a4a704 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPackage
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPackage
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsPackage'
+NAME = 'cheets_GTS.7.0_r5.GtsPackage'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsPackage',
-        test_name='cheets_GTS.7.0_r4.GtsPackage',
+        tag='7.0_r5.GtsPackage',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=2160)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPartnerBookmarksTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPartnerBookmarksTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsPartnerBookmarksTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsPartnerBookmarksTestCases
index de11e64..7ed9981 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPartnerBookmarksTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPartnerBookmarksTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsPartnerBookmarksTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsPartnerBookmarksTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsPartnerBookmarksTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsPartnerBookmarksTestCases',
+        tag='7.0_r5.GtsPartnerBookmarksTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPermission b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPermission
similarity index 89%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsPermission
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsPermission
index 3219df9..6bce64b 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPermission
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsPermission'
+NAME = 'cheets_GTS.7.0_r5.GtsPermission'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsPermission',
-        test_name='cheets_GTS.7.0_r4.GtsPermission',
+        tag='7.0_r5.GtsPermission',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPlacementTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPlacementTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsPlacementTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsPlacementTestCases
index 592e3e9..7bf60d1 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPlacementTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPlacementTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsPlacementTestCases'
+NAME = 'cheets_GTS.7.0_r5.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='7.0_r4.GtsPlacementTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsPlacementTestCases',
+        tag='7.0_r5.GtsPlacementTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPlay b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPlay
similarity index 90%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsPlay
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsPlay
index 4d63fde..057146d 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPlay
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPlay
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsPlay'
+NAME = 'cheets_GTS.7.0_r5.GtsPlay'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsPlay',
-        test_name='cheets_GTS.7.0_r4.GtsPlay',
+        tag='7.0_r5.GtsPlay',
+        test_name='cheets_GTS.7.0_r5.GtsPlay',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsPlayAutoInstallTestCases', '--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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPrintTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPrintTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsPrintTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsPrintTestCases
index b562ab0..90501b1 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPrintTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPrintTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsPrintTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsPrintTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsPrintTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsPrintTestCases',
+        tag='7.0_r5.GtsPrintTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPrivacyTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPrivacyTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsPrivacyTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsPrivacyTestCases
index e31694d..22a9798 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPrivacyTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPrivacyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsPrivacyTestCases'
+NAME = 'cheets_GTS.7.0_r5.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='7.0_r4.GtsPrivacyTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsPrivacyTestCases',
+        tag='7.0_r5.GtsPrivacyTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPrivilegedUpdatePreparer b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPrivilegedUpdatePreparer
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsPrivilegedUpdatePreparer
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsPrivilegedUpdatePreparer
index 2f15af4..8d21a06 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPrivilegedUpdatePreparer
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPrivilegedUpdatePreparer
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsPrivilegedUpdatePreparer'
+NAME = 'cheets_GTS.7.0_r5.GtsPrivilegedUpdatePreparer'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsPrivilegedUpdatePreparer',
-        test_name='cheets_GTS.7.0_r4.GtsPrivilegedUpdatePreparer',
+        tag='7.0_r5.GtsPrivilegedUpdatePreparer',
+        test_name='cheets_GTS.7.0_r5.GtsPrivilegedUpdatePreparer',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrivilegedUpdatePreparer', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsPrivilegedUpdatePreparer',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPropertiesTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPropertiesTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsPropertiesTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsPropertiesTestCases
index 59431c5..810293c 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsPropertiesTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsPropertiesTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsPropertiesTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsPropertiesTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsPropertiesTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsPropertiesTestCases',
+        tag='7.0_r5.GtsPropertiesTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsRegulationComplianceTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsRegulationComplianceTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsRegulationComplianceTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsRegulationComplianceTestCases
index 44704cc..4340fff 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsRegulationComplianceTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsRegulationComplianceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsRegulationComplianceTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsRegulationComplianceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsRegulationComplianceTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsRegulationComplianceTestCases',
+        tag='7.0_r5.GtsRegulationComplianceTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsRlzTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsRlzTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsRlzTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsRlzTestCases
index a78e19d..0292707 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsRlzTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsRlzTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsRlzTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsRlzTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsRlzTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsRlzTestCases',
+        tag='7.0_r5.GtsRlzTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSample b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSample
similarity index 90%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsSample
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsSample
index bc53788..80b7d8f 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSample
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSample
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsSample'
+NAME = 'cheets_GTS.7.0_r5.GtsSample'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsSample',
-        test_name='cheets_GTS.7.0_r4.GtsSample',
+        tag='7.0_r5.GtsSample',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1440)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsScreenshotHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsScreenshotHostTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsScreenshotHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsScreenshotHostTestCases
index 6985c0e..dfff004 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsScreenshotHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsScreenshotHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsScreenshotHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsScreenshotHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsScreenshotHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsScreenshotHostTestCases',
+        tag='7.0_r5.GtsScreenshotHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSearchHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSearchHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsSearchHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsSearchHostTestCases
index 1dd4753..fe4d803 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSearchHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSearchHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsSearchHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsSearchHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsSearchHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsSearchHostTestCases',
+        tag='7.0_r5.GtsSearchHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSecurityHostTestCases
similarity index 72%
copy from server/site_tests/cheets_GTS/control.7.0_r4.GtsAccountsHostTestCases
copy to server/site_tests/cheets_GTS/control.7.0_r5.GtsSecurityHostTestCases
index d2c1e1c..1bbe9fb 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsAccountsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSecurityHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsAccountsHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsSecurityHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsAccountsHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsSecurityHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsAccountsHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsAccountsHostTestCases',
+        tag='7.0_r5.GtsSecurityHostTestCases',
+        test_name='cheets_GTS.7.0_r5.GtsSecurityHostTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAccountsHostTestCases', '--ignore-business-logic-failure'],
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSecurityHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsAccountsHostTestCases',
+        target_module='GtsSecurityHostTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSensorHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSensorHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsSensorHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsSensorHostTestCases
index 7f5950a..67b24b9 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSensorHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSensorHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsSensorHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsSensorHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsSensorHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsSensorHostTestCases',
+        tag='7.0_r5.GtsSensorHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSettings b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSettings
similarity index 89%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsSettings
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsSettings
index b238a59..5f77c15 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSettings
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSettings
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsSettings'
+NAME = 'cheets_GTS.7.0_r5.GtsSettings'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsSettings',
-        test_name='cheets_GTS.7.0_r4.GtsSettings',
+        tag='7.0_r5.GtsSettings',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSetupWizard b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSetupWizard
similarity index 88%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsSetupWizard
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsSetupWizard
index 9b8eb39..8717e20 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSetupWizard
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSetupWizard
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsSetupWizard'
+NAME = 'cheets_GTS.7.0_r5.GtsSetupWizard'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsSetupWizard',
-        test_name='cheets_GTS.7.0_r4.GtsSetupWizard',
+        tag='7.0_r5.GtsSetupWizard',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSimAppDialogTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSimAppDialogTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsSimAppDialogTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsSimAppDialogTestCases
index 9636915..98fad4c 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSimAppDialogTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSimAppDialogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsSimAppDialogTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsSimAppDialogTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsSimAppDialogTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsSimAppDialogTestCases',
+        tag='7.0_r5.GtsSimAppDialogTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSmartBatteryDeviceTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSmartBatteryDeviceTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsSmartBatteryDeviceTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsSmartBatteryDeviceTestCases
index 609f1c0..ba4c516 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSmartBatteryDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSmartBatteryDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsSmartBatteryDeviceTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsSmartBatteryDeviceTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsSmartBatteryDeviceTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsSmartBatteryDeviceTestCases',
+        tag='7.0_r5.GtsSmartBatteryDeviceTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSsaidHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSsaidHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsSsaidHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsSsaidHostTestCases
index d09d30f..413529d 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSsaidHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSsaidHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsSsaidHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsSsaidHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsSsaidHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsSsaidHostTestCases',
+        tag='7.0_r5.GtsSsaidHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsStagedInstallHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsStagedInstallHostTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsStagedInstallHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsStagedInstallHostTestCases
index dd1a337..8dc2f38 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsStagedInstallHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsStagedInstallHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsStagedInstallHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsStagedInstallHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsStagedInstallHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsStagedInstallHostTestCases',
+        tag='7.0_r5.GtsStagedInstallHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsStatsdHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsStatsdHostTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsStatsdHostTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsStatsdHostTestCases
index 382107f..ab14461 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsStatsdHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsStatsdHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsStatsdHostTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsStatsdHostTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsStatsdHostTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsStatsdHostTestCases',
+        tag='7.0_r5.GtsStatsdHostTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsStorageTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsStorageTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsStorageTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsStorageTestCases
index 425b39a..9882022 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsStorageTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsStorageTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsStorageTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsStorageTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsStorageTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsStorageTestCases',
+        tag='7.0_r5.GtsStorageTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSupervisionTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSupervisionTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsSupervisionTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsSupervisionTestCases
index 1941d30..190c850 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSupervisionTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSupervisionTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsSupervisionTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsSupervisionTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsSupervisionTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsSupervisionTestCases',
+        tag='7.0_r5.GtsSupervisionTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSuspendApps b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSuspendApps
similarity index 88%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsSuspendApps
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsSuspendApps
index 03b2a94..660c1d4 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsSuspendApps
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsSuspendApps
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsSuspendApps'
+NAME = 'cheets_GTS.7.0_r5.GtsSuspendApps'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsSuspendApps',
-        test_name='cheets_GTS.7.0_r4.GtsSuspendApps',
+        tag='7.0_r5.GtsSuspendApps',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsTelecomManagerTests b/server/site_tests/cheets_GTS/control.7.0_r5.GtsTelecomManagerTests
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsTelecomManagerTests
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsTelecomManagerTests
index 11a32b2..f955ab1 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsTelecomManagerTests
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsTelecomManagerTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsTelecomManagerTests'
+NAME = 'cheets_GTS.7.0_r5.GtsTelecomManagerTests'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsTelecomManagerTests',
-        test_name='cheets_GTS.7.0_r4.GtsTelecomManagerTests',
+        tag='7.0_r5.GtsTelecomManagerTests',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsTelephonyTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsTelephonyTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsTelephonyTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsTelephonyTestCases
index 2d751fc..a6b2ae1 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsTelephonyTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsTelephonyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsTelephonyTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsTelephonyTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsTelephonyTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsTelephonyTestCases',
+        tag='7.0_r5.GtsTelephonyTestCases',
+        test_name='cheets_GTS.7.0_r5.GtsTelephonyTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTelephonyTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='GtsTelephonyTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsTestHarnessModeTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsTestHarnessModeTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsTestHarnessModeTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsTestHarnessModeTestCases
index 0ef166a..a2226e2 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsTestHarnessModeTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsTestHarnessModeTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsTestHarnessModeTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsTestHarnessModeTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsTestHarnessModeTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsTestHarnessModeTestCases',
+        tag='7.0_r5.GtsTestHarnessModeTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsTetheringTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsTetheringTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsTetheringTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsTetheringTestCases
index 56e186c..9c166a6 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsTetheringTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsTetheringTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsTetheringTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsTetheringTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsTetheringTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsTetheringTestCases',
+        tag='7.0_r5.GtsTetheringTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsTv b/server/site_tests/cheets_GTS/control.7.0_r5.GtsTv
similarity index 90%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsTv
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsTv
index 48e7488..28b4f5f 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsTv
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsTv
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsTv'
+NAME = 'cheets_GTS.7.0_r5.GtsTv'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsTv',
-        test_name='cheets_GTS.7.0_r4.GtsTv',
+        tag='7.0_r5.GtsTv',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1440)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsUnofficialApisUsageTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsUnofficialApisUsageTestCases
similarity index 85%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsUnofficialApisUsageTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsUnofficialApisUsageTestCases
index d20a113..cb741d4 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsUnofficialApisUsageTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsUnofficialApisUsageTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsUnofficialApisUsageTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsUnofficialApisUsageTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsUnofficialApisUsageTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsUnofficialApisUsageTestCases',
+        tag='7.0_r5.GtsUnofficialApisUsageTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsUsageStatsTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsUsageStatsTestCases
similarity index 86%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsUsageStatsTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsUsageStatsTestCases
index 1b077be..de8717d 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsUsageStatsTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsUsageStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsUsageStatsTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsUsageStatsTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsUsageStatsTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsUsageStatsTestCases',
+        tag='7.0_r5.GtsUsageStatsTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsViewTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsViewTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsViewTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsViewTestCases
index 5c212af..84b66d6 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsViewTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsViewTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsViewTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsViewTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsViewTestCases',
+        tag='7.0_r5.GtsViewTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsWebView b/server/site_tests/cheets_GTS/control.7.0_r5.GtsWebView
similarity index 89%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsWebView
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsWebView
index bc47d5b..1b1d6f0 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsWebView
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsWebView
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsWebView'
+NAME = 'cheets_GTS.7.0_r5.GtsWebView'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsWebView',
-        test_name='cheets_GTS.7.0_r4.GtsWebView',
+        tag='7.0_r5.GtsWebView',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1080)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsWellbeing b/server/site_tests/cheets_GTS/control.7.0_r5.GtsWellbeing
similarity index 89%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsWellbeing
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsWellbeing
index 6904a1e..540bc60 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsWellbeing
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsWellbeing
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsWellbeing'
+NAME = 'cheets_GTS.7.0_r5.GtsWellbeing'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_GTS',
         hosts=host_list,
         iterations=1,
-        tag='7.0_r4.GtsWellbeing',
-        test_name='cheets_GTS.7.0_r4.GtsWellbeing',
+        tag='7.0_r5.GtsWellbeing',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1440)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.GtsYouTubeTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.GtsYouTubeTestCases
similarity index 87%
rename from server/site_tests/cheets_GTS/control.7.0_r4.GtsYouTubeTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.GtsYouTubeTestCases
index c28ecfbb..02a9acd 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.GtsYouTubeTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.GtsYouTubeTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.GtsYouTubeTestCases'
+NAME = 'cheets_GTS.7.0_r5.GtsYouTubeTestCases'
 ATTRIBUTES = 'suite:arc-gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='7.0_r4.GtsYouTubeTestCases',
-        test_name='cheets_GTS.7.0_r4.GtsYouTubeTestCases',
+        tag='7.0_r5.GtsYouTubeTestCases',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.all.CtsCheckpointTestCases_-_GtsCallLogTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.all.CtsCheckpointTestCases_-_GtsCallLogTestCases
similarity index 91%
rename from server/site_tests/cheets_GTS/control.7.0_r4.all.CtsCheckpointTestCases_-_GtsCallLogTestCases
rename to server/site_tests/cheets_GTS/control.7.0_r5.all.CtsCheckpointTestCases_-_GtsCallLogTestCases
index 583d92b..362c67e 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.all.CtsCheckpointTestCases_-_GtsCallLogTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.all.CtsCheckpointTestCases_-_GtsCallLogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.7.0_r4.all.CtsCheckpointTestCases_-_GtsCallLogTestCases'
+NAME = 'cheets_GTS.7.0_r5.all.CtsCheckpointTestCases_-_GtsCallLogTestCases'
 ATTRIBUTES = 'suite:arc-gts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='7.0_r4.all.CtsCheckpointTestCases_-_GtsCallLogTestCases',
-        test_name='cheets_GTS.7.0_r4.all.CtsCheckpointTestCases_-_GtsCallLogTestCases',
+        tag='7.0_r5.all.CtsCheckpointTestCases_-_GtsCallLogTestCases',
+        test_name='cheets_GTS.7.0_r5.all.CtsCheckpointTestCases_-_GtsCallLogTestCases',
         authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
         run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'CtsCheckpointTestCases', '--include-filter', 'GtsAccountsHostTestCases', '--include-filter', 'GtsAdminTestCases', '--include-filter', 'GtsAfwTestCases', '--include-filter', 'GtsAndroidAutoDeviceTestCases', '--include-filter', 'GtsAppBlacklistDeviceTestCases', '--include-filter', 'GtsAppTestCases', '--include-filter', 'GtsArtManagerHostTestCases', '--include-filter', 'GtsAssistIntentTestCases', '--include-filter', 'GtsAssistantHostTestCases', '--include-filter', 'GtsBackupHostTestCases', '--include-filter', 'GtsBackupTestCases', '--include-filter', 'GtsBootStatsTestCases', '--include-filter', 'GtsCallLogTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsCheckpointTestCases_-_GtsCallLogTestCases',
         target_plan=None,
-        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=86400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r5.all.GtsCameraTestCases_-_GtsYouTubeTestCases b/server/site_tests/cheets_GTS/control.7.0_r5.all.GtsCameraTestCases_-_GtsYouTubeTestCases
new file mode 100644
index 0000000..f3cb09d
--- /dev/null
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.all.GtsCameraTestCases_-_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.7.0_r5.all.GtsCameraTestCases_-_GtsYouTubeTestCases'
+ATTRIBUTES = 'suite:arc-gts-qual'
+DEPENDENCIES = 'arc'
+JOB_RETRIES = 1
+TEST_TYPE = 'server'
+TIME = 'LONG'
+MAX_RESULT_SIZE_KB = 307200
+DOC = 'Run module GtsCameraTestCases, GtsCastHostTestCases, GtsContactsAppDeviceTestCases, GtsContactsTest, GtsContentTestCases, GtsDeviceConfigTestCases, GtsDexModuleRegistrationTestCases, GtsDialerDeviceTestCases, GtsDozeDeviceTestCases, GtsEdiHostTestCases, GtsExoPlayerTestCases, GtsFeaturesTestCases, GtsGameDeviceHostTestCases, GtsGmscoreHostTestCases, GtsGraphicsHostTestCases, GtsHomeHostTestCases, GtsIncidentConfirmationTestCases, GtsIncidentManagerTestCases, GtsInstallPackagesWhitelistDeviceTestCases, GtsInstantAppsHostTestCases, GtsLargeApkHostTestCases, GtsLocationHostTestCases, GtsLocationTestCases, GtsMediaTestCases, GtsMemoryHostTestCases, GtsMemoryTestCases, GtsModuleMetadataTestCases, GtsNetStatsHostTestCases, GtsNetTestCases, GtsNetworkStackHostTestCases, GtsNetworkWatchlistTestCases, GtsNmgiarcTestCases, GtsNoPermissionTestCases, GtsNoPermissionTestCases25, GtsNotificationTestCases, GtsOemLockServiceTestCases, GtsOsTestCases, GtsPackageInstallTestCases, GtsPackageInstallerTapjackingTestCases, GtsPackageManagerHostTestCases, GtsPackageNameCertPairsDeviceTestCases, GtsPackageUninstallTestCases, GtsPartnerBookmarksTestCases, GtsPermissionControllerHostTestCases, GtsPermissionTestCases, GtsPlacementTestCases, GtsPlayAutoInstallTestCases, GtsPlayStoreHostTestCases, GtsPrintTestCases, GtsPrivacyTestCases, GtsPrivilegedUpdatePreparer, GtsPropertiesTestCases, GtsRegulationComplianceTestCases, GtsRlzTestCases, GtsSampleDeviceTestCases, GtsSampleDynamicConfigTestCases, GtsSampleHostTestCases, GtsScreenshotHostTestCases, GtsSearchHostTestCases, GtsSecurityHostTestCases, GtsSensorHostTestCases, GtsSettingsHostTestCases, GtsSettingsTestCases, GtsSetupWizardHostTestCases, GtsSetupWizardNoPermissionTestCases, GtsSimAppDialogTestCases, GtsSmartBatteryDeviceTestCases, GtsSsaidHostTestCases, GtsStagedInstallHostTestCases, GtsStatsdHostTestCases, GtsStorageTestCases, GtsSupervisionTestCases, GtsSuspendAppsPermissionTestCases, GtsSuspendAppsTestCases, GtsTelecomManagerTests, GtsTelephonyTestCases, GtsTestHarnessModeTestCases, GtsTetheringTestCases, GtsTvBugReportTestCases, GtsTvHostTestCases, GtsTvTestCases, GtsUnofficialApisUsageTestCases, GtsUsageStatsTestCases, GtsViewTestCases, 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='7.0_r5.all.GtsCameraTestCases_-_GtsYouTubeTestCases',
+        test_name='cheets_GTS.7.0_r5.all.GtsCameraTestCases_-_GtsYouTubeTestCases',
+        authkey='gs://chromeos-arc-images/cts/bundle/gts-arc.json',
+        run_template=['run', 'commandAndExit', 'gts', '--include-filter', 'GtsCameraTestCases', '--include-filter', 'GtsCastHostTestCases', '--include-filter', 'GtsContactsAppDeviceTestCases', '--include-filter', 'GtsContactsTest', '--include-filter', 'GtsContentTestCases', '--include-filter', 'GtsDeviceConfigTestCases', '--include-filter', 'GtsDexModuleRegistrationTestCases', '--include-filter', 'GtsDialerDeviceTestCases', '--include-filter', 'GtsDozeDeviceTestCases', '--include-filter', 'GtsEdiHostTestCases', '--include-filter', 'GtsExoPlayerTestCases', '--include-filter', 'GtsFeaturesTestCases', '--include-filter', 'GtsGameDeviceHostTestCases', '--include-filter', 'GtsGmscoreHostTestCases', '--include-filter', 'GtsGraphicsHostTestCases', '--include-filter', 'GtsHomeHostTestCases', '--include-filter', 'GtsIncidentConfirmationTestCases', '--include-filter', 'GtsIncidentManagerTestCases', '--include-filter', 'GtsInstallPackagesWhitelistDeviceTestCases', '--include-filter', 'GtsInstantAppsHostTestCases', '--include-filter', 'GtsLargeApkHostTestCases', '--include-filter', 'GtsLocationHostTestCases', '--include-filter', 'GtsLocationTestCases', '--include-filter', 'GtsMediaTestCases', '--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', 'GtsPlayStoreHostTestCases', '--include-filter', 'GtsPrintTestCases', '--include-filter', 'GtsPrivacyTestCases', '--include-filter', 'GtsPrivilegedUpdatePreparer', '--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', 'GtsSsaidHostTestCases', '--include-filter', 'GtsStagedInstallHostTestCases', '--include-filter', 'GtsStatsdHostTestCases', '--include-filter', 'GtsStorageTestCases', '--include-filter', 'GtsSupervisionTestCases', '--include-filter', 'GtsSuspendAppsPermissionTestCases', '--include-filter', 'GtsSuspendAppsTestCases', '--include-filter', 'GtsTelecomManagerTests', '--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', 'GtsViewTestCases', '--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.GtsCameraTestCases_-_GtsYouTubeTestCases',
+        target_plan=None,
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
+        prerequisites=['bluetooth'],
+        timeout=86400)
+
+parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.7.0_r4.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_GTS/control.7.0_r5.tradefed-run-collect-tests-only-internal
similarity index 84%
rename from server/site_tests/cheets_GTS/control.7.0_r4.tradefed-run-collect-tests-only-internal
rename to server/site_tests/cheets_GTS/control.7.0_r5.tradefed-run-collect-tests-only-internal
index e4047ab..7380ea6 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r4.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_GTS/control.7.0_r5.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.7.0_r4.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_GTS.7.0_r5.tradefed-run-collect-tests-only-internal'
 ATTRIBUTES = 'suite:arc-gts, suite:arc-gts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=0,
-        tag='7.0_r4.tradefed-run-collect-tests-only-internal',
-        test_name='cheets_GTS.7.0_r4.tradefed-run-collect-tests-only-internal',
+        tag='7.0_r5.tradefed-run-collect-tests-only-internal',
+        test_name='cheets_GTS.7.0_r5.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-7_r4-6219464.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r5-6497315.zip',
         timeout=1800)
 
 parallel_simple(run_TS, machines)