cheets_CTS_P: Uprev to 9.0_r17.

BUG=b:197030212
TEST=cheets_CTS_P.9.0_r17.arm.CtsAbiOverrideHostTestCases

Change-Id: I06c5fa7c2c8a24c13c9254965cdc497e661b0bfb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3102471
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Jiyoun Ha <jiyounha@chromium.org>
Reviewed-by: Jiyoun Ha <jiyounha@chromium.org>
(cherry picked from commit debb614caba34625138e60b2a231225ef630a5cb)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3153196
diff --git a/server/site_tests/cheets_CTS_P/cheets_CTS_P.py b/server/site_tests/cheets_CTS_P/cheets_CTS_P.py
index 2bd40bb..597e168 100644
--- a/server/site_tests/cheets_CTS_P/cheets_CTS_P.py
+++ b/server/site_tests/cheets_CTS_P/cheets_CTS_P.py
@@ -30,8 +30,8 @@
 _PUBLIC_CTS = 'https://dl.google.com/dl/android/cts/'
 _PARTNER_CTS = 'gs://chromeos-partner-cts/'
 _CTS_URI = {
-        'arm': _PUBLIC_CTS + 'android-cts-9.0_r16-linux_x86-arm.zip',
-        'x86': _PUBLIC_CTS + 'android-cts-9.0_r16-linux_x86-x86.zip',
+        'arm': _PUBLIC_CTS + 'android-cts-9.0_r17-linux_x86-arm.zip',
+        'x86': _PUBLIC_CTS + 'android-cts-9.0_r17-linux_x86-x86.zip',
 }
 _CTS_MEDIA_URI = _PUBLIC_CTS + 'android-cts-media-1.5.zip'
 _CTS_MEDIA_LOCALPATH = '/tmp/android-cts-media'
@@ -39,8 +39,8 @@
 # Internal uprev for all CTS modules.
 _INTERNAL_CTS = 'gs://chromeos-arc-images/cts/bundle/P/'
 _CTS_LATEST_URI = {
-        'arm': _INTERNAL_CTS + 'android-cts-9.0_r16-linux_x86-arm.zip',
-        'x86': _INTERNAL_CTS + 'android-cts-9.0_r16-linux_x86-x86.zip',
+        'arm': _INTERNAL_CTS + 'android-cts-9.0_r17-linux_x86-arm.zip',
+        'x86': _INTERNAL_CTS + 'android-cts-9.0_r17-linux_x86-x86.zip',
 }
 
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAbiOverrideHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAbiOverrideHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAbiOverrideHostTestCases
index 67bc45d..8b03ac3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAbiOverrideHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsAbiOverrideHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAbiOverrideHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsAbiOverrideHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsAbiOverrideHostTestCases',
+        tag='9.0_r17.arm.CtsAbiOverrideHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsAbiOverrideHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAbiOverrideHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAbiOverrideHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccelerationTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAccelerationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccelerationTestCases
index 7c2b196..7307f96 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccelerationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsAccelerationTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAccelerationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-arc'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r16.arm.CtsAccelerationTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsAccelerationTestCases',
+        tag='9.0_r17.arm.CtsAccelerationTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsAccelerationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccelerationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAccelerationTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAccessibility b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccessibility
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAccessibility
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccessibility
index 6516507..b99848f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccessibility
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsAccessibility'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAccessibility'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsAccessibility',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsAccessibility',
+        tag='9.0_r17.arm.CtsAccessibility',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsAccessibility',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--include-filter', 'CtsAccessibilityTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAccessibility',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccountManagerTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccountManagerTestCases
index d1cfe39..d4404df 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccountManagerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r16.arm.CtsAccountManagerTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsAccountManagerTestCases',
+        tag='9.0_r17.arm.CtsAccountManagerTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsAccountManagerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccountManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAccountManagerTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsActivityManagerDevice
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsActivityManagerDevice
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsActivityManagerDevice
index 1a9a99c..6908c6c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsActivityManagerDevice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsActivityManagerDevice'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsActivityManagerDevice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsActivityManagerDevice',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsActivityManagerDevice',
+        tag='9.0_r17.arm.CtsActivityManagerDevice',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsActivityManagerDevice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsActivityManagerDevice',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAdmin b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAdmin
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAdmin
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAdmin
index 6c5c457..c1af631 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAdmin
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAdmin
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsAdmin'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAdmin'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsAdmin',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsAdmin',
+        tag='9.0_r17.arm.CtsAdmin',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsAdmin',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAdmin',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAlarm b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAlarm
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAlarm
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAlarm
index b9d03ac..b3eea2d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAlarm
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAlarm
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsAlarm'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAlarm'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsAlarm',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsAlarm',
+        tag='9.0_r17.arm.CtsAlarm',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsAlarm',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAlarm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAndroid b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAndroid
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAndroid
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAndroid
index e74dd22..a38a23b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAndroid
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAndroid
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsAndroid'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAndroid'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsAndroid',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsAndroid',
+        tag='9.0_r17.arm.CtsAndroid',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsAndroid',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAndroid',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAnimationTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAnimationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAnimationTestCases
index 0ec574f..9c77d71 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAnimationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsAnimationTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAnimationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsAnimationTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsAnimationTestCases',
+        tag='9.0_r17.arm.CtsAnimationTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsAnimationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAnimationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAnimationTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsApacheHttpLegacy b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApacheHttpLegacy
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsApacheHttpLegacy
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApacheHttpLegacy
index 1d60da3..09c632e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsApacheHttpLegacy
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApacheHttpLegacy
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsApacheHttpLegacy'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsApacheHttpLegacy'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsApacheHttpLegacy',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsApacheHttpLegacy',
+        tag='9.0_r17.arm.CtsApacheHttpLegacy',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsApacheHttpLegacy',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsApacheHttpLegacy',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsApp b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApp
similarity index 92%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsApp
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApp
index d4e97a5..7e02e02 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsApp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsApp'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsApp'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         enable_default_apps=True,
-        tag='9.0_r16.arm.CtsApp',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsApp',
+        tag='9.0_r17.arm.CtsApp',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsApp',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsApp',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAslrMallocTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAslrMallocTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAslrMallocTestCases
index 4e1b543..107ee63 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAslrMallocTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsAslrMallocTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAslrMallocTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsAslrMallocTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsAslrMallocTestCases',
+        tag='9.0_r17.arm.CtsAslrMallocTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsAslrMallocTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAslrMallocTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAslrMallocTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAssistTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAssistTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAssistTestCases
index 59d191f..002abf4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAssistTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsAssistTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAssistTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsAssistTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsAssistTestCases',
+        tag='9.0_r17.arm.CtsAssistTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsAssistTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAssistTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAssistTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAtraceHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAtraceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAtraceHostTestCases
index 5676387..545366f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAtraceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsAtraceHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAtraceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsAtraceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsAtraceHostTestCases',
+        tag='9.0_r17.arm.CtsAtraceHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsAtraceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAtraceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAtraceHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAutoFillServiceTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAutoFillServiceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAutoFillServiceTestCases
index 36ad969..1699680 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAutoFillServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsAutoFillServiceTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAutoFillServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsAutoFillServiceTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsAutoFillServiceTestCases',
+        tag='9.0_r17.arm.CtsAutoFillServiceTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsAutoFillServiceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAutoFillServiceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAutoFillServiceTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackgroundRestrictionsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBackgroundRestrictionsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackgroundRestrictionsTestCases
index 539ea23..15eeaf5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackgroundRestrictionsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsBackgroundRestrictionsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsBackgroundRestrictionsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsBackgroundRestrictionsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsBackgroundRestrictionsTestCases',
+        tag='9.0_r17.arm.CtsBackgroundRestrictionsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsBackgroundRestrictionsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBackgroundRestrictionsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBackgroundRestrictionsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBackup b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackup
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBackup
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackup
index c82cff3..72d99ae 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBackup
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackup
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsBackup'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsBackup'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsBackup',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsBackup',
+        tag='9.0_r17.arm.CtsBackup',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsBackup',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBackup',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBatterySavingTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBatterySavingTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBatterySavingTestCases
index 528826c..f07087f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBatterySavingTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsBatterySavingTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsBatterySavingTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsBatterySavingTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsBatterySavingTestCases',
+        tag='9.0_r17.arm.CtsBatterySavingTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsBatterySavingTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBatterySavingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBatterySavingTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBionicTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBionicTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBionicTestCases
index 3648608..21df919 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBionicTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsBionicTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsBionicTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsBionicTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsBionicTestCases',
+        tag='9.0_r17.arm.CtsBionicTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsBionicTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBionicTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBionicTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBluetoothTestCases
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBluetoothTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBluetoothTestCases
index b21a3d6..93fce89 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBluetoothTestCases
@@ -7,7 +7,7 @@
 from autotest_lib.server import utils
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsBluetoothTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsBluetoothTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -33,8 +33,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsBluetoothTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsBluetoothTestCases',
+        tag='9.0_r17.arm.CtsBluetoothTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsBluetoothTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBluetoothTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBluetoothTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBootStatsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBootStatsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBootStatsTestCases
index f0562fd..d91571e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBootStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsBootStatsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsBootStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsBootStatsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsBootStatsTestCases',
+        tag='9.0_r17.arm.CtsBootStatsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsBootStatsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBootStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBootStatsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCalendarcommon2TestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCalendarcommon2TestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCalendarcommon2TestCases
index 7869291..f29e1d6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCalendarcommon2TestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsCalendarcommon2TestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCalendarcommon2TestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsCalendarcommon2TestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsCalendarcommon2TestCases',
+        tag='9.0_r17.arm.CtsCalendarcommon2TestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsCalendarcommon2TestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCalendarcommon2TestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCalendarcommon2TestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCamera b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCamera
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCamera
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCamera
index a3e0930..cc0d4af 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCamera
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsCamera'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCamera'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsCamera',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsCamera',
+        tag='9.0_r17.arm.CtsCamera',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsCamera',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCamera',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCameraTestCases.noled.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCameraTestCases.noled.camerabox.back
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back
index cea5fdd..c508aab 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCameraTestCases.noled.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsCameraTestCases.noled.camerabox.back'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc, camerabox_light:noled, camerabox_facing:back'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         cmdline_args=args,
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsCameraTestCases.noled.camerabox.back',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsCameraTestCases.noled.camerabox.back',
+        tag='9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCameraTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCameraTestCases.noled.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCameraTestCases.noled.camerabox.front
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front
index 0725dcf..1044cfc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCameraTestCases.noled.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsCameraTestCases.noled.camerabox.front'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc, camerabox_light:noled, camerabox_facing:front'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         cmdline_args=args,
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsCameraTestCases.noled.camerabox.front',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsCameraTestCases.noled.camerabox.front',
+        tag='9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCameraTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCarTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarTestCases
index c617af7..344812d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsCarTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCarTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsCarTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsCarTestCases',
+        tag='9.0_r17.arm.CtsCarTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsCarTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCarTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarrierApiTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCarrierApiTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarrierApiTestCases
index a8865c7..58d5fcd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarrierApiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsCarrierApiTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCarrierApiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsCarrierApiTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsCarrierApiTestCases',
+        tag='9.0_r17.arm.CtsCarrierApiTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsCarrierApiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarrierApiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCarrierApiTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsColorModeTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsColorModeTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsColorModeTestCases
index 3806272..26de434 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsColorModeTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsColorModeTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsColorModeTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsColorModeTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsColorModeTestCases',
+        tag='9.0_r17.arm.CtsColorModeTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsColorModeTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsColorModeTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsColorModeTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCompilationTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCompilationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCompilationTestCases
index a271759..3f43550 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCompilationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsCompilationTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCompilationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsCompilationTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsCompilationTestCases',
+        tag='9.0_r17.arm.CtsCompilationTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsCompilationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCompilationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCompilationTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContactsProviderWipe
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsContactsProviderWipe
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContactsProviderWipe
index 97ffd90..766c758 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContactsProviderWipe
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsContactsProviderWipe'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsContactsProviderWipe'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsContactsProviderWipe',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsContactsProviderWipe',
+        tag='9.0_r17.arm.CtsContactsProviderWipe',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsContactsProviderWipe',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContactsProviderWipe', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsContactsProviderWipe',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContentTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsContentTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContentTestCases
index a131edc..d379473 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsContentTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsContentTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         enable_default_apps=True,
-        tag='9.0_r16.arm.CtsContentTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsContentTestCases',
+        tag='9.0_r17.arm.CtsContentTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsContentTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsContentTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCppToolsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCppToolsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCppToolsTestCases
index 8ab72ba..2c89d33 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCppToolsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsCppToolsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCppToolsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsCppToolsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsCppToolsTestCases',
+        tag='9.0_r17.arm.CtsCppToolsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsCppToolsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCppToolsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCppToolsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCurrentApiSignatureTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCurrentApiSignatureTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCurrentApiSignatureTestCases
index 863852b..b26e973 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCurrentApiSignatureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsCurrentApiSignatureTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCurrentApiSignatureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsCurrentApiSignatureTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsCurrentApiSignatureTestCases',
+        tag='9.0_r17.arm.CtsCurrentApiSignatureTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsCurrentApiSignatureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCurrentApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCurrentApiSignatureTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDatabaseTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDatabaseTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDatabaseTestCases
index 6c40a2f..57dddf0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDatabaseTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDatabaseTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDatabaseTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDatabaseTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDatabaseTestCases',
+        tag='9.0_r17.arm.CtsDatabaseTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDatabaseTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDatabaseTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDatabaseTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDebugTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDebugTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDebugTestCases
index bcaf9f8..dc7842d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDebugTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDebugTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDebugTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDebugTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDebugTestCases',
+        tag='9.0_r17.arm.CtsDebugTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDebugTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDebugTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.32
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.32
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.32
index 030c6f4..6b14883 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.32
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDeqpTestCases.32'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.32'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-deqp, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r16.arm.CtsDeqpTestCases.32',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDeqpTestCases.32',
+        tag='9.0_r17.arm.CtsDeqpTestCases.32',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.32',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'armeabi-v7a', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.64
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.64
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.64
index 7d4eac9..6813320 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.64
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDeqpTestCases.64'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.64'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-deqp, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r16.arm.CtsDeqpTestCases.64',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDeqpTestCases.64',
+        tag='9.0_r17.arm.CtsDeqpTestCases.64',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.64',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'arm64-v8a', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-EGL
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL
index 09eddd3..4082103 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDeqpTestCases.dEQP-EGL'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDeqpTestCases.dEQP-EGL',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDeqpTestCases.dEQP-EGL',
+        tag='9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-EGL.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES2
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES2
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES2
index 49937be..faa277c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES2
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES2'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES2'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES2',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES2',
+        tag='9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES2',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES2',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES2.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES3
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3
index 72fd915..67d97d9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES3'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES3',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES3',
+        tag='9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES31
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31
index 27cc5e9..1c55db0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES31'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES31',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDeqpTestCases.dEQP-GLES31',
+        tag='9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES31.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-VK b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-VK
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-VK
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-VK
index 5298a5d..c6d9600 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDeqpTestCases.dEQP-VK
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-VK
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDeqpTestCases.dEQP-VK'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-VK'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDeqpTestCases.dEQP-VK',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDeqpTestCases.dEQP-VK',
+        tag='9.0_r17.arm.CtsDeqpTestCases.dEQP-VK',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-VK',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-VK.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDevice b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDevice
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDevice
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDevice
index 7022bd2..2f97255 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDevice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDevice'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDevice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDevice',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDevice',
+        tag='9.0_r17.arm.CtsDevice',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDevice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDevice',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDexMetadataHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDexMetadataHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDexMetadataHostTestCases
index 033a633..0430ec7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDexMetadataHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDexMetadataHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDexMetadataHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDexMetadataHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDexMetadataHostTestCases',
+        tag='9.0_r17.arm.CtsDexMetadataHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDexMetadataHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDexMetadataHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDexMetadataHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDisplayTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDisplayTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDisplayTestCases
index b170d52..9454d6c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDisplayTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDisplayTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDisplayTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDisplayTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDisplayTestCases',
+        tag='9.0_r17.arm.CtsDisplayTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDisplayTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDisplayTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDisplayTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDpi b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDpi
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDpi
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDpi
index 19262aa..739e0b0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDpi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDpi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDpi'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDpi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDpi',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDpi',
+        tag='9.0_r17.arm.CtsDpi',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDpi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDpi',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDreamsTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDreamsTestCases
index f0b13e4..d6cc533 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDreamsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDreamsTestCases',
+        tag='9.0_r17.arm.CtsDreamsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDreamsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDreamsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDrmTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDrmTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDrmTestCases
index ba1b2a7..30ce057 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDrmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDrmTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDrmTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDrmTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDrmTestCases',
+        tag='9.0_r17.arm.CtsDrmTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDrmTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDrmTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDrmTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDumpsysHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDumpsysHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDumpsysHostTestCases
index dda001d..87be7d2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDumpsysHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDumpsysHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDumpsysHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDumpsysHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDumpsysHostTestCases',
+        tag='9.0_r17.arm.CtsDumpsysHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDumpsysHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDumpsysHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDumpsysHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDynamicLinkerTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDynamicLinkerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDynamicLinkerTestCases
index 5308113..10bedc4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDynamicLinkerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsDynamicLinkerTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDynamicLinkerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsDynamicLinkerTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsDynamicLinkerTestCases',
+        tag='9.0_r17.arm.CtsDynamicLinkerTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsDynamicLinkerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDynamicLinkerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDynamicLinkerTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEdiHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsEdiHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEdiHostTestCases
index d9839af..0052fe4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEdiHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsEdiHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsEdiHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsEdiHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsEdiHostTestCases',
+        tag='9.0_r17.arm.CtsEdiHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsEdiHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEdiHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsEdiHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEffectTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsEffectTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEffectTestCases
index 540a553..19e0eee 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEffectTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsEffectTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsEffectTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsEffectTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsEffectTestCases',
+        tag='9.0_r17.arm.CtsEffectTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsEffectTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEffectTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsEffectTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsExternalS b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsExternalS
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsExternalS
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsExternalS
index 2dfd659..16b123f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsExternalS
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsExternalS
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsExternalS'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsExternalS'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsExternalS',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsExternalS',
+        tag='9.0_r17.arm.CtsExternalS',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsExternalS',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsExternalS',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFileSystemTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFileSystemTestCases
index 7960d09..19fbb42 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFileSystemTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsFileSystemTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsFileSystemTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsFileSystemTestCases',
+        tag='9.0_r17.arm.CtsFileSystemTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsFileSystemTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsFileSystemTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsFragment b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFragment
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsFragment
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFragment
index 7c2498d..a2c7a77 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsFragment
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFragment
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsFragment'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsFragment'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsFragment',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsFragment',
+        tag='9.0_r17.arm.CtsFragment',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsFragment',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsFragment',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGestureTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsGestureTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGestureTestCases
index eb22754..ff05b39 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGestureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsGestureTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsGestureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsGestureTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsGestureTestCases',
+        tag='9.0_r17.arm.CtsGestureTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsGestureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGestureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsGestureTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGpuToolsHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsGpuToolsHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGpuToolsHostTestCases
index 93c5f5d..ff261f7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGpuToolsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsGpuToolsHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsGpuToolsHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsGpuToolsHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsGpuToolsHostTestCases',
+        tag='9.0_r17.arm.CtsGpuToolsHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsGpuToolsHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGpuToolsHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsGpuToolsHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGraphicsTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsGraphicsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGraphicsTestCases
index 2b507e7..e7ca414 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGraphicsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsGraphicsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsGraphicsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=5,
-        tag='9.0_r16.arm.CtsGraphicsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsGraphicsTestCases',
+        tag='9.0_r17.arm.CtsGraphicsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsGraphicsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGraphicsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsGraphicsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHardwareTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHardwareTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHardwareTestCases
index cb80c18..fe0c920 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHardwareTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsHardwareTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsHardwareTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsHardwareTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsHardwareTestCases',
+        tag='9.0_r17.arm.CtsHardwareTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsHardwareTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHardwareTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHardwareTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHarmfulAppWarningHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHarmfulAppWarningHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHarmfulAppWarningHostTestCases
index fd07d30..d2e9cac 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHarmfulAppWarningHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsHarmfulAppWarningHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsHarmfulAppWarningHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsHarmfulAppWarningHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsHarmfulAppWarningHostTestCases',
+        tag='9.0_r17.arm.CtsHarmfulAppWarningHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsHarmfulAppWarningHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHarmfulAppWarningHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHarmfulAppWarningHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHiddenApi b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHiddenApi
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHiddenApi
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHiddenApi
index ce75eae..0653d62 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHiddenApi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHiddenApi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsHiddenApi'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsHiddenApi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsHiddenApi',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsHiddenApi',
+        tag='9.0_r17.arm.CtsHiddenApi',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsHiddenApi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHiddenApi',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostTzDataTests
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHostTzDataTests
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostTzDataTests
index ad41a19..8139d2a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostTzDataTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsHostTzDataTests'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsHostTzDataTests'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsHostTzDataTests',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsHostTzDataTests',
+        tag='9.0_r17.arm.CtsHostTzDataTests',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsHostTzDataTests',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHostTzDataTests', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHostTzDataTests',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHostside b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostside
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHostside
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostside
index e107b8d..90de9a4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsHostside
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostside
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsHostside'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsHostside'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsHostside',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsHostside',
+        tag='9.0_r17.arm.CtsHostside',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsHostside',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHostside',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIcuTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsIcuTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIcuTestCases
index 4e8d9ef..0ff743d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIcuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsIcuTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsIcuTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsIcuTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsIcuTestCases',
+        tag='9.0_r17.arm.CtsIcuTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsIcuTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIcuTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsIcuTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIncidentHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsIncidentHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIncidentHostTestCases
index 02f1a7c..0e75fda 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIncidentHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsIncidentHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsIncidentHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsIncidentHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsIncidentHostTestCases',
+        tag='9.0_r17.arm.CtsIncidentHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsIncidentHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIncidentHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsIncidentHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInlineMockingTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsInlineMockingTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInlineMockingTestCases
index 8891b99..0b59500 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInlineMockingTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsInlineMockingTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsInlineMockingTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsInlineMockingTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsInlineMockingTestCases',
+        tag='9.0_r17.arm.CtsInlineMockingTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsInlineMockingTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsInlineMockingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsInlineMockingTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsInputMethod b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInputMethod
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsInputMethod
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInputMethod
index 972993e..94543b4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsInputMethod
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInputMethod
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsInputMethod'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsInputMethod'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsInputMethod',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsInputMethod',
+        tag='9.0_r17.arm.CtsInputMethod',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsInputMethod',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsInputMethod',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsIntentSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIntentSignatureTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsIntentSignatureTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIntentSignatureTestCases
index 67105a3..5885b77 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsIntentSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIntentSignatureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsIntentSignatureTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsIntentSignatureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsIntentSignatureTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsIntentSignatureTestCases',
+        tag='9.0_r17.arm.CtsIntentSignatureTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsIntentSignatureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIntentSignatureTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsIntentSignatureTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJankDeviceTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJankDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJankDeviceTestCases
index e2f2487..561a4ae 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJankDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsJankDeviceTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsJankDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r16.arm.CtsJankDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsJankDeviceTestCases',
+        tag='9.0_r17.arm.CtsJankDeviceTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsJankDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJankDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJankDeviceTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJdwp b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJdwp
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJdwp
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJdwp
index bdbb29d..0525e1f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJdwp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJdwp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsJdwp'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsJdwp'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsJdwp',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsJdwp',
+        tag='9.0_r17.arm.CtsJdwp',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsJdwp',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJdwp',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJniTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJniTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJniTestCases
index 45a9424..c0bf40b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJniTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsJniTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsJniTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsJniTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsJniTestCases',
+        tag='9.0_r17.arm.CtsJniTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsJniTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJniTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJniTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJobScheduler b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJobScheduler
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJobScheduler
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJobScheduler
index 08a1227..7ccba27 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJobScheduler
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJobScheduler
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsJobScheduler'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsJobScheduler'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsJobScheduler',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsJobScheduler',
+        tag='9.0_r17.arm.CtsJobScheduler',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsJobScheduler',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJobScheduler',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJvmti b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJvmti
similarity index 98%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJvmti
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJvmti
index de56c99..ae09bd9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsJvmti
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJvmti
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsJvmti'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsJvmti'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsJvmti',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsJvmti',
+        tag='9.0_r17.arm.CtsJvmti',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsJvmti',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJvmti',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKernelConfigTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsKernelConfigTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKernelConfigTestCases
index 65d2d2f..259a3d3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKernelConfigTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsKernelConfigTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsKernelConfigTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsKernelConfigTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsKernelConfigTestCases',
+        tag='9.0_r17.arm.CtsKernelConfigTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsKernelConfigTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKernelConfigTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsKernelConfigTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKeystoreTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsKeystoreTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKeystoreTestCases
index 456fb4a..26f566a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKeystoreTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsKeystoreTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsKeystoreTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsKeystoreTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsKeystoreTestCases',
+        tag='9.0_r17.arm.CtsKeystoreTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsKeystoreTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKeystoreTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsKeystoreTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLeanbackJankTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLeanbackJankTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLeanbackJankTestCases
index 4f0a89c..b23245d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLeanbackJankTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsLeanbackJankTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsLeanbackJankTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsLeanbackJankTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsLeanbackJankTestCases',
+        tag='9.0_r17.arm.CtsLeanbackJankTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsLeanbackJankTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLeanbackJankTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLeanbackJankTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLegacyNotificationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLegacyNotificationTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLegacyNotificationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLegacyNotificationTestCases
index 39a3fe0..a7fd8bd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLegacyNotificationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLegacyNotificationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsLegacyNotificationTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsLegacyNotificationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsLegacyNotificationTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsLegacyNotificationTestCases',
+        tag='9.0_r17.arm.CtsLegacyNotificationTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsLegacyNotificationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLegacyNotificationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLegacyNotificationTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLibcore b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLibcore
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLibcore
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLibcore
index 8955f94..34f2a3a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLibcore
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLibcore
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsLibcore'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsLibcore'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsLibcore',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsLibcore',
+        tag='9.0_r17.arm.CtsLibcore',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsLibcore',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLibcore',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLiblogTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLiblogTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLiblogTestCases
index ec74a2b..a3b5bce 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLiblogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsLiblogTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsLiblogTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsLiblogTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsLiblogTestCases',
+        tag='9.0_r17.arm.CtsLiblogTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsLiblogTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLiblogTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLiblogTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLocation b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLocation
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLocation
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLocation
index e393368..df04bb0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLocation
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLocation
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsLocation'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsLocation'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsLocation',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsLocation',
+        tag='9.0_r17.arm.CtsLocation',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsLocation',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLocation',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLogdTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLogdTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLogdTestCases
index bb959e5..65f4c30 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLogdTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsLogdTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsLogdTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsLogdTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsLogdTestCases',
+        tag='9.0_r17.arm.CtsLogdTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsLogdTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLogdTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLogdTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaBitstreamsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaBitstreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaBitstreamsTestCases
index 113d77c..a9e58f4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaBitstreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsMediaBitstreamsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaBitstreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r16.arm.CtsMediaBitstreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsMediaBitstreamsTestCases',
+        tag='9.0_r17.arm.CtsMediaBitstreamsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaBitstreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaBitstreamsTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaBitstreamsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaHostTestCases
index e0ab929..5fe1c3e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsMediaHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsMediaHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsMediaHostTestCases',
+        tag='9.0_r17.arm.CtsMediaHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMediaHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaStressTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases
index 9b957d5..15f5199 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsMediaStressTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaStressTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r16.arm.CtsMediaStressTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsMediaStressTestCases',
+        tag='9.0_r17.arm.CtsMediaStressTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaStressTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaStressTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.32
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaTestCases.32
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.32
index 5f7ca2e..e458c43 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.32
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsMediaTestCases.32'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.32'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r16.arm.CtsMediaTestCases.32',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsMediaTestCases.32',
+        tag='9.0_r17.arm.CtsMediaTestCases.32',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.32',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure', '--abi', 'armeabi-v7a'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.64
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaTestCases.64
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.64
index 820df72..ecb95fd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.64
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsMediaTestCases.64'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.64'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r16.arm.CtsMediaTestCases.64',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsMediaTestCases.64',
+        tag='9.0_r17.arm.CtsMediaTestCases.64',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.64',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure', '--abi', 'arm64-v8a'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaTestCases.audio b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.audio
similarity index 94%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaTestCases.audio
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.audio
index ae07952..57b1de9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMediaTestCases.audio
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.audio
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsMediaTestCases.audio'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.audio'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r16.arm.CtsMediaTestCases.audio',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsMediaTestCases.audio',
+        tag='9.0_r17.arm.CtsMediaTestCases.audio',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.audio',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioAttributesTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioEffectTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioFocusTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioFormatTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioManagerTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioNativeTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioPlayRoutingNative', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioPlaybackConfigurationTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioPreProcessingTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioPresentationTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioRecordAppOpTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioRecordRoutingNative', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioRecordTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioRecord_BufferSizeTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioRecordingConfigurationTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioTrackLatencyTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioTrackSurroundTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioTrackTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioTrack_ListenerTest', '--include-filter', 'CtsMediaTestCases android.media.cts.SoundPoolAacTest', '--include-filter', 'CtsMediaTestCases android.media.cts.SoundPoolMidiTest', '--include-filter', 'CtsMediaTestCases android.media.cts.SoundPoolOggTest', '--include-filter', 'CtsMediaTestCases android.media.cts.VolumeShaperTest', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMidiTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMidiTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMidiTestCases
index 5755d9ba6..7bd0b21 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMidiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsMidiTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMidiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsMidiTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsMidiTestCases',
+        tag='9.0_r17.arm.CtsMidiTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsMidiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMidiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMidiTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMocking b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMocking
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMocking
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMocking
index 8f03e62..58f130e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMocking
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMocking
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsMocking'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMocking'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsMocking',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsMocking',
+        tag='9.0_r17.arm.CtsMocking',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsMocking',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMocking',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMonkeyTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMonkeyTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMonkeyTestCases
index 9e103da..ad980d2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMonkeyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsMonkeyTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMonkeyTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsMonkeyTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsMonkeyTestCases',
+        tag='9.0_r17.arm.CtsMonkeyTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsMonkeyTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMonkeyTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMonkeyTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMultiUser b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMultiUser
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMultiUser
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMultiUser
index bb7faa9..cf9f46f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsMultiUser
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMultiUser
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsMultiUser'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMultiUser'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsMultiUser',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsMultiUser',
+        tag='9.0_r17.arm.CtsMultiUser',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsMultiUser',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMultiUser',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNNAPITestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNNAPITestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNNAPITestCases
index aaf7287..4a589fd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNNAPITestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsNNAPITestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsNNAPITestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsNNAPITestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsNNAPITestCases',
+        tag='9.0_r17.arm.CtsNNAPITestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsNNAPITestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNNAPITestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNNAPITestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNative b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNative
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNative
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNative
index fd6cfd2..3bcb6f0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNative
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNative
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsNative'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsNative'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsNative',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsNative',
+        tag='9.0_r17.arm.CtsNative',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsNative',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNative',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNdefTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNdefTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNdefTestCases
index 0c49083..d5062ee 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNdefTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsNdefTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsNdefTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsNdefTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsNdefTestCases',
+        tag='9.0_r17.arm.CtsNdefTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsNdefTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNdefTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNdefTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNet b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNet
similarity index 95%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNet
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNet
index 6a3adda..b265e62 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNet
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNet
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsNet'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsNet'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsNet',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsNet',
+        tag='9.0_r17.arm.CtsNet',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsNet',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNet',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNet b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNet.lab-experiment
similarity index 80%
copy from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNet
copy to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNet.lab-experiment
index 6a3adda..dbc2036 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsNet
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNet.lab-experiment
@@ -4,9 +4,11 @@
 
 # This file has been automatically generated. Do not edit!
 
+from autotest_lib.client.common_lib import utils, global_config
+
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsNet'
-ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsNet.lab-experiment'
+ATTRIBUTES = ''
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
 TEST_TYPE = 'server'
@@ -15,19 +17,25 @@
 DOC = 'Run module CtsNetSecConfigAttributeTestCases, CtsNetSecConfigBasicDebugDisabledTestCases, CtsNetSecConfigBasicDebugEnabledTestCases, CtsNetSecConfigBasicDomainConfigTestCases, CtsNetSecConfigCleartextTrafficTestCases, CtsNetSecConfigDownloadManagerTestCases, CtsNetSecConfigInvalidPinTestCases, CtsNetSecConfigNestedDomainConfigTestCases, CtsNetSecConfigPrePCleartextTrafficTestCases, CtsNetSecConfigResourcesSrcTestCases, CtsNetSecPolicyUsesCleartextTrafficFalseTestCases, CtsNetSecPolicyUsesCleartextTrafficTrueTestCases, CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases, CtsNetTestCases, CtsNetTestCasesLegacyApi22, CtsNetTestCasesLegacyPermission22 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
+    ssid = utils.get_wireless_ssid(machine['hostname'])
+    wifipass = global_config.global_config.get_config_value('CLIENT',
+            'wireless_password', default=None)
+
     host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsNet',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsNet',
+        tag='9.0_r17.arm.CtsNet.lab-experiment',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsNet.lab-experiment',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNet',
         target_plan=None,
         bundle='arm',
         uri='LATEST',
+        precondition_commands=['/usr/local/autotest/cros/scripts/wifi connect %s %s' % (ssid, wifipass), 'android-sh -c \'dumpsys wifi transports -eth\''],
+        retry_manual_tests=True,
         timeout=30600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOmapiTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsOmapiTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOmapiTestCases
index 7d800a0..b8f2bcc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOmapiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsOmapiTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsOmapiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsOmapiTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsOmapiTestCases',
+        tag='9.0_r17.arm.CtsOmapiTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsOmapiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsOmapiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsOmapiTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsOpenG b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOpenG
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsOpenG
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOpenG
index ea37107..e950c2c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsOpenG
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOpenG
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsOpenG'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsOpenG'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r16.arm.CtsOpenG',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsOpenG',
+        tag='9.0_r17.arm.CtsOpenG',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsOpenG',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsOpenG',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsOs b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOs
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsOs
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOs
index 8f6a91e..4d95a34 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsOs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsOs'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsOs'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsOs',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsOs',
+        tag='9.0_r17.arm.CtsOs',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsOs',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsOs',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPdfTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPdfTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPdfTestCases
index 347c68e..d55cc64 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPdfTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsPdfTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsPdfTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsPdfTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsPdfTestCases',
+        tag='9.0_r17.arm.CtsPdfTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsPdfTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPdfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPdfTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPerfettoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases
index 0fd6b2d..2a89849 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsPerfettoTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsPerfettoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsPerfettoTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsPerfettoTestCases',
+        tag='9.0_r17.arm.CtsPerfettoTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsPerfettoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPerfettoTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPermission b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermission
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPermission
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermission
index a6d5c5a..86baa32 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPermission
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsPermission'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsPermission'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r16.arm.CtsPermission',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsPermission',
+        tag='9.0_r17.arm.CtsPermission',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsPermission',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPermission',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPreference b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPreference
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPreference
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPreference
index d56c8a5..6c7cb18 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPreference
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPreference
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsPreference'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsPreference'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsPreference',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsPreference',
+        tag='9.0_r17.arm.CtsPreference',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsPreference',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPreference',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPrintTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPrintTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPrintTestCases
index 89baab2..2bcb33b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPrintTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsPrintTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsPrintTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsPrintTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsPrintTestCases',
+        tag='9.0_r17.arm.CtsPrintTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsPrintTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPrintTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPrintTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProtoTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsProtoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProtoTestCases
index 9d95341..703cd0c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProtoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsProtoTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsProtoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsProtoTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsProtoTestCases',
+        tag='9.0_r17.arm.CtsProtoTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsProtoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProtoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsProtoTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProviderTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsProviderTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProviderTestCases
index e3d712c..7c3a8fd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProviderTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsProviderTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsProviderTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsProviderTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsProviderTestCases',
+        tag='9.0_r17.arm.CtsProviderTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsProviderTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProviderTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsProviderTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsRenderscript b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRenderscript
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsRenderscript
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRenderscript
index c5226ae..75ac5e3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsRenderscript
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRenderscript
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsRenderscript'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsRenderscript'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsRenderscript',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsRenderscript',
+        tag='9.0_r17.arm.CtsRenderscript',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsRenderscript',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsRenderscript',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsRs b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRs
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsRs
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRs
index 6792ba4..c67ec40 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsRs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsRs'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsRs'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsRs',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsRs',
+        tag='9.0_r17.arm.CtsRs',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsRs',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsRs',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSample b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSample
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSample
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSample
index 5ef5d3e..66fbead 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSample
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSample
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSample'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSample'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsSample',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSample',
+        tag='9.0_r17.arm.CtsSample',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSample',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSample',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSaxTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSaxTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSaxTestCases
index 03ad9ce..05ba0e6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSaxTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSaxTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSaxTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsSaxTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSaxTestCases',
+        tag='9.0_r17.arm.CtsSaxTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSaxTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSaxTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSaxTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSeccompHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSeccompHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSeccompHostTestCases
index 3a3bfae..515ccfe 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSeccompHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSeccompHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSeccompHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsSeccompHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSeccompHostTestCases',
+        tag='9.0_r17.arm.CtsSeccompHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSeccompHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSeccompHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSeccompHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecureElementAccessControl
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSecureElementAccessControl
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecureElementAccessControl
index bd43d5a..c139669 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecureElementAccessControl
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSecureElementAccessControl'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSecureElementAccessControl'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsSecureElementAccessControl',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSecureElementAccessControl',
+        tag='9.0_r17.arm.CtsSecureElementAccessControl',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSecureElementAccessControl',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSecureElementAccessControl',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSecurity b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecurity
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSecurity
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecurity
index d310d5b..a83bcf8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSecurity
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecurity
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSecurity'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSecurity'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsSecurity',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSecurity',
+        tag='9.0_r17.arm.CtsSecurity',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSecurity',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--include-filter', 'CtsSecurityHostTestCases', '--include-filter', 'CtsSecurityTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSecurity',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSelinuxTargetSdk b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSelinuxTargetSdk
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSelinuxTargetSdk
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSelinuxTargetSdk
index 911c07b..c82d286 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSelinuxTargetSdk
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSelinuxTargetSdk
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSelinuxTargetSdk'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSelinuxTargetSdk'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsSelinuxTargetSdk',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSelinuxTargetSdk',
+        tag='9.0_r17.arm.CtsSelinuxTargetSdk',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSelinuxTargetSdk',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSelinuxTargetSdk',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSensorTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases
index d3d6f03..3643b44 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSensorTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSensorTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r16.arm.CtsSensorTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSensorTestCases',
+        tag='9.0_r17.arm.CtsSensorTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSensorTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSensorTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsShortcut b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsShortcut
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsShortcut
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsShortcut
index f5cab26..ff30fbd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsShortcut
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsShortcut
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsShortcut'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsShortcut'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsShortcut',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsShortcut',
+        tag='9.0_r17.arm.CtsShortcut',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsShortcut',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsShortcut',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSimRestrictedApisTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimRestrictedApisTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSimRestrictedApisTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimRestrictedApisTestCases
index b0dd1b3..25c09be 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSimRestrictedApisTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimRestrictedApisTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSimRestrictedApisTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSimRestrictedApisTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsSimRestrictedApisTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSimRestrictedApisTestCases',
+        tag='9.0_r17.arm.CtsSimRestrictedApisTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSimRestrictedApisTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimRestrictedApisTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSimRestrictedApisTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleCpuTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSimpleCpuTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleCpuTestCases
index 209aeae..751fb20 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleCpuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSimpleCpuTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSimpleCpuTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsSimpleCpuTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSimpleCpuTestCases',
+        tag='9.0_r17.arm.CtsSimpleCpuTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSimpleCpuTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleCpuTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSimpleCpuTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleperfTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSimpleperfTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleperfTestCases
index 9c886b8..2061e94 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleperfTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSimpleperfTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSimpleperfTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r16.arm.CtsSimpleperfTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSimpleperfTestCases',
+        tag='9.0_r17.arm.CtsSimpleperfTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSimpleperfTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleperfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSimpleperfTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSkQPTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSkQPTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSkQPTestCases
index c46dd54..0f7bf4b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSkQPTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSkQPTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSkQPTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsSkQPTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSkQPTestCases',
+        tag='9.0_r17.arm.CtsSkQPTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSkQPTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSkQPTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSkQPTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSliceTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSliceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSliceTestCases
index 0fd7b38..92591c5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSliceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSliceTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSliceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsSliceTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSliceTestCases',
+        tag='9.0_r17.arm.CtsSliceTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSliceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSliceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSliceTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSpeechTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSpeechTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSpeechTestCases
index e729bec..bf0812f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSpeechTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSpeechTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSpeechTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r16.arm.CtsSpeechTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSpeechTestCases',
+        tag='9.0_r17.arm.CtsSpeechTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSpeechTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSpeechTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSpeechTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsStatsdHostTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsStatsdHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsStatsdHostTestCases
index 5448b0b..9dcaf9f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsStatsdHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsStatsdHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsStatsdHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsStatsdHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsStatsdHostTestCases',
+        tag='9.0_r17.arm.CtsStatsdHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsStatsdHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsStatsdHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsStatsdHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSustainedPerformanceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases
index 8b9839f..b7a71e5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSustainedPerformanceHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSustainedPerformanceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsSustainedPerformanceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSustainedPerformanceHostTestCases',
+        tag='9.0_r17.arm.CtsSustainedPerformanceHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSustainedPerformanceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSustainedPerformanceHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSync b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSync
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSync
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSync
index cfc166b..45ec895 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSync
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSync
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSync'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSync'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsSync',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSync',
+        tag='9.0_r17.arm.CtsSync',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSync',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSync',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSystem b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSystem
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSystem
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSystem
index b63cace..40d67a8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsSystem
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSystem
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsSystem'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSystem'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsSystem',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsSystem',
+        tag='9.0_r17.arm.CtsSystem',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsSystem',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSystem',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTelecom b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelecom
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTelecom
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelecom
index 27be3d5..901e371 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTelecom
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelecom
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsTelecom'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsTelecom'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r16.arm.CtsTelecom',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsTelecom',
+        tag='9.0_r17.arm.CtsTelecom',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsTelecom',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTelecom',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTelephony b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelephony
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTelephony
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelephony
index 23ed8f7..2e0dbfc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTelephony
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelephony
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsTelephony'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsTelephony'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r16.arm.CtsTelephony',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsTelephony',
+        tag='9.0_r17.arm.CtsTelephony',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsTelephony',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTelephony',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTextTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTextTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTextTestCases
index e22b8e4..f7a4ed4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTextTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsTextTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsTextTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsTextTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsTextTestCases',
+        tag='9.0_r17.arm.CtsTextTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsTextTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTextTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTextTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTheme b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTheme
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTheme
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTheme
index b5659bb..675136d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTheme
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTheme
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsTheme'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsTheme'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r16.arm.CtsTheme',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsTheme',
+        tag='9.0_r17.arm.CtsTheme',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsTheme',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTheme',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsToast b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsToast
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsToast
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsToast
index acd994c..cb1226e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsToast
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsToast
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsToast'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsToast'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsToast',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsToast',
+        tag='9.0_r17.arm.CtsToast',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsToast',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsToast',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTransitionTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTransitionTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTransitionTestCases
index 637e123..aa8e6ea 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTransitionTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsTransitionTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsTransitionTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r16.arm.CtsTransitionTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsTransitionTestCases',
+        tag='9.0_r17.arm.CtsTransitionTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsTransitionTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTransitionTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTransitionTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTrustedVoiceHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTrustedVoiceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTrustedVoiceHostTestCases
index 4d766c1..9e3bb17 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTrustedVoiceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsTrustedVoiceHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsTrustedVoiceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsTrustedVoiceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsTrustedVoiceHostTestCases',
+        tag='9.0_r17.arm.CtsTrustedVoiceHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsTrustedVoiceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTrustedVoiceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTrustedVoiceHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTv b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTv
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTv
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTv
index 0bd9547..77b21d0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsTv
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTv
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsTv'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsTv'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r16.arm.CtsTv',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsTv',
+        tag='9.0_r17.arm.CtsTv',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsTv',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTv',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUi b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUi
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUi
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUi
index 27fccb9..ceba2ff 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsUi'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsUi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsUi',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsUi',
+        tag='9.0_r17.arm.CtsUi',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsUi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUi',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUidIsolationTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUidIsolationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUidIsolationTestCases
index 0c105c2..28cd466 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUidIsolationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsUidIsolationTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsUidIsolationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsUidIsolationTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsUidIsolationTestCases',
+        tag='9.0_r17.arm.CtsUidIsolationTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsUidIsolationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUidIsolationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUidIsolationTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUsageStatsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases
index cd5f57f..ed87112 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsUsageStatsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsUsageStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsUsageStatsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsUsageStatsTestCases',
+        tag='9.0_r17.arm.CtsUsageStatsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsUsageStatsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUsageStatsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsbTests
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUsbTests
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsbTests
index c1d37c5..76d5f14 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsbTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsUsbTests'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsUsbTests'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r16.arm.CtsUsbTests',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsUsbTests',
+        tag='9.0_r17.arm.CtsUsbTests',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsUsbTests',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsbTests', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUsbTests',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUtilTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUtilTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUtilTestCases
index 325d94e..aee5470 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUtilTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsUtilTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsUtilTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsUtilTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsUtilTestCases',
+        tag='9.0_r17.arm.CtsUtilTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsUtilTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUtilTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUtilTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVideoTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsVideoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVideoTestCases
index 4861d9d..0d49d55 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVideoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsVideoTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsVideoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsVideoTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsVideoTestCases',
+        tag='9.0_r17.arm.CtsVideoTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsVideoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVideoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVideoTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsViewTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases
index 88e14ec..3510131 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsViewTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsViewTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsViewTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsViewTestCases',
+        tag='9.0_r17.arm.CtsViewTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsViewTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsViewTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVmTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsVmTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVmTestCases
index c159d7f..80a6ede 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsVmTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsVmTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsVmTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsVmTestCases',
+        tag='9.0_r17.arm.CtsVmTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsVmTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVmTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVmTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsVoice b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVoice
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsVoice
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVoice
index 0c50ebf..8a23192 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsVoice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVoice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsVoice'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsVoice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r16.arm.CtsVoice',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsVoice',
+        tag='9.0_r17.arm.CtsVoice',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsVoice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVoice',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVrTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsVrTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVrTestCases
index ec009fc..0c3179a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVrTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsVrTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsVrTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsVrTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsVrTestCases',
+        tag='9.0_r17.arm.CtsVrTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsVrTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVrTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVrTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWebkitTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsWebkitTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWebkitTestCases
index b4eefcf..cbab00a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWebkitTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsWebkitTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsWebkitTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsWebkitTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsWebkitTestCases',
+        tag='9.0_r17.arm.CtsWebkitTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsWebkitTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWebkitTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWebkitTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWidgetTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsWidgetTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWidgetTestCases
index be9b86b..2dc597f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWidgetTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsWidgetTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsWidgetTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsWidgetTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsWidgetTestCases',
+        tag='9.0_r17.arm.CtsWidgetTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsWidgetTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWidgetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWidgetTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWindowManagerDeviceTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsWindowManagerDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWindowManagerDeviceTestCases
index 02c0191..fae72c6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWindowManagerDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsWindowManagerDeviceTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsWindowManagerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsWindowManagerDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsWindowManagerDeviceTestCases',
+        tag='9.0_r17.arm.CtsWindowManagerDeviceTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsWindowManagerDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWindowManagerDeviceTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsWrap b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWrap
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsWrap
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWrap
index d877758..e6523b8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.CtsWrap
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWrap
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.CtsWrap'
+NAME = 'cheets_CTS_P.9.0_r17.arm.CtsWrap'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.CtsWrap',
-        test_name='cheets_CTS_P.9.0_r16.arm.CtsWrap',
+        tag='9.0_r17.arm.CtsWrap',
+        test_name='cheets_CTS_P.9.0_r17.arm.CtsWrap',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWrap',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
index 998c488..7d84cb2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
+        tag='9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--include-filter', 'CtsAccelerationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
index ba7e8f5..58d1acd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
+        tag='9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccessibilityServiceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
index 881b480..0b6aca2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
+        tag='9.0_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--include-filter', 'CtsAccountManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
index 6f4aeb3..ba27ebe 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
+        tag='9.0_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
similarity index 95%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
index 0e910ca..a1ee751 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         iterations=1,
         max_retry=9,
         enable_default_apps=True,
-        tag='9.0_r16.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
+        tag='9.0_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--include-filter', 'CtsAnimationTestCases', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--include-filter', 'CtsAslrMallocTestCases', '--include-filter', 'CtsAssistTestCases', '--include-filter', 'CtsAtraceHostTestCases', '--include-filter', 'CtsAutoFillServiceTestCases', '--include-filter', 'CtsBackgroundRestrictionsTestCases', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--include-filter', 'CtsBatterySavingTestCases', '--include-filter', 'CtsBionicTestCases', '--include-filter', 'CtsBluetoothTestCases', '--include-filter', 'CtsBootStatsTestCases', '--include-filter', 'CtsCalendarcommon2TestCases', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--include-filter', 'CtsCarTestCases', '--include-filter', 'CtsCarrierApiTestCases', '--include-filter', 'CtsColorModeTestCases', '--include-filter', 'CtsCompilationTestCases', '--include-filter', 'CtsContactsProviderWipe', '--include-filter', 'CtsContentTestCases', '--include-filter', 'CtsCppToolsTestCases', '--include-filter', 'CtsCurrentApiSignatureTestCases', '--include-filter', 'CtsDatabaseTestCases', '--include-filter', 'CtsDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
index 61918b6..eddf00d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r16.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
+        tag='9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'armeabi-v7a', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
index 14b705c..7a903da 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r16.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
+        tag='9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'arm64-v8a', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
index 973d10d..c74db8b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
+        tag='9.0_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--include-filter', 'CtsDexMetadataHostTestCases', '--include-filter', 'CtsDisplayTestCases', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--include-filter', 'CtsDreamsTestCases', '--include-filter', 'CtsDrmTestCases', '--include-filter', 'CtsDumpsysHostTestCases', '--include-filter', 'CtsDynamicLinkerTestCases', '--include-filter', 'CtsEdiHostTestCases', '--include-filter', 'CtsEffectTestCases', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
index 2f9ad87..e3521b0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        tag='9.0_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
similarity index 94%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
index 147cda0..dbb3409 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
+        tag='9.0_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--include-filter', 'CtsGestureTestCases', '--include-filter', 'CtsGpuToolsHostTestCases', '--include-filter', 'CtsGraphicsTestCases', '--include-filter', 'CtsHardwareTestCases', '--include-filter', 'CtsHarmfulAppWarningHostTestCases', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--include-filter', 'CtsHostTzDataTests', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--include-filter', 'CtsIcuTestCases', '--include-filter', 'CtsIncidentHostTestCases', '--include-filter', 'CtsInlineMockingTestCases', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--include-filter', 'CtsIntentSignatureTestCases', '--include-filter', 'CtsJankDeviceTestCases', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--include-filter', 'CtsJniTestCases', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
similarity index 98%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
index 33b5abc..05292b2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
+        tag='9.0_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--include-filter', 'CtsKernelConfigTestCases', '--include-filter', 'CtsKeystoreTestCases', '--include-filter', 'CtsLeanbackJankTestCases', '--include-filter', 'CtsLegacyNotificationTestCases', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--include-filter', 'CtsLiblogTestCases', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--include-filter', 'CtsLogdTestCases', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
index 5b97d31..2ab1d03 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r16.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
+        tag='9.0_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaBitstreamsTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
index 65c87c0..87374d5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
+        tag='9.0_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
index 9e96383..a7ed547 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r16.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
+        tag='9.0_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32
index 4ebf2fa..8bc7699 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r16.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32',
+        tag='9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure', '--abi', 'armeabi-v7a'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsMediaTestCases_-_CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64
index 89d4dda..b81bf8d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r16.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64',
+        tag='9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure', '--abi', 'arm64-v8a'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsMediaTestCases_-_CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
similarity index 96%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
index 66799e5..5ada80f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
+        tag='9.0_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--include-filter', 'CtsMonkeyTestCases', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--include-filter', 'CtsNNAPITestCases', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--include-filter', 'CtsNdefTestCases', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--include-filter', 'CtsOmapiTestCases', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--include-filter', 'CtsPdfTestCases', '--include-filter', 'CtsPerfettoTestCases', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--include-filter', 'CtsPrintTestCases', '--include-filter', 'CtsProtoTestCases', '--include-filter', 'CtsProviderTestCases', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--include-filter', 'CtsSaxTestCases', '--include-filter', 'CtsSeccompHostTestCases', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
index bedefb8..aea457b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
+        tag='9.0_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSecurityHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
index b693e1d..1dac13c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
+        tag='9.0_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsSensorTestCases_-_CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
index e7b5932..89cf21c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsSensorTestCases_-_CtsSensorTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r16.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
+        tag='9.0_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsSensorTestCases_-_CtsSensorTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
similarity index 95%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
index a58cf2c..777e941 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
+        tag='9.0_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--include-filter', 'CtsSimRestrictedApisTestCases', '--include-filter', 'CtsSimpleCpuTestCases', '--include-filter', 'CtsSimpleperfTestCases', '--include-filter', 'CtsSkQPTestCases', '--include-filter', 'CtsSliceTestCases', '--include-filter', 'CtsSpeechTestCases', '--include-filter', 'CtsStatsdHostTestCases', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--include-filter', 'CtsTextTestCases', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--include-filter', 'CtsTransitionTestCases', '--include-filter', 'CtsTrustedVoiceHostTestCases', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--include-filter', 'CtsUidIsolationTestCases', '--include-filter', 'CtsUsageStatsTestCases', '--include-filter', 'CtsUsbTests', '--include-filter', 'CtsUtilTestCases', '--include-filter', 'CtsVideoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsViewTestCases_-_CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsViewTestCases_-_CtsViewTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases
index 1b71da3..449bfa9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsViewTestCases_-_CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsViewTestCases_-_CtsViewTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsViewTestCases_-_CtsViewTestCases',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsViewTestCases_-_CtsViewTestCases',
+        tag='9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsViewTestCases_-_CtsViewTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsVmTestCases_-_vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsVmTestCases_-_vm-tests-tf
similarity index 92%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsVmTestCases_-_vm-tests-tf
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsVmTestCases_-_vm-tests-tf
index c3eab18..c8f41a9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.all.CtsVmTestCases_-_vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsVmTestCases_-_vm-tests-tf
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.all.CtsVmTestCases_-_vm-tests-tf'
+NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsVmTestCases_-_vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.arm.all.CtsVmTestCases_-_vm-tests-tf',
-        test_name='cheets_CTS_P.9.0_r16.arm.all.CtsVmTestCases_-_vm-tests-tf',
+        tag='9.0_r17.arm.all.CtsVmTestCases_-_vm-tests-tf',
+        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsVmTestCases_-_vm-tests-tf',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVmTestCases', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--include-filter', 'CtsVrTestCases', '--include-filter', 'CtsWebkitTestCases', '--include-filter', 'CtsWidgetTestCases', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--include-filter', 'cts-system-all.api', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--include-filter', 'vm-tests-tf', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsVmTestCases_-_vm-tests-tf',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.cts-system-all.api
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.cts-system-all.api
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.cts-system-all.api
index 226f87e..f7dff21 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.cts-system-all.api
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.cts-system-all.api'
+NAME = 'cheets_CTS_P.9.0_r17.arm.cts-system-all.api'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.cts-system-all.api',
-        test_name='cheets_CTS_P.9.0_r16.arm.cts-system-all.api',
+        tag='9.0_r17.arm.cts-system-all.api',
+        test_name='cheets_CTS_P.9.0_r17.arm.cts-system-all.api',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='cts-system-all.api',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.signed-CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.signed-CtsSecureElementAccessControl
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.signed-CtsSecureElementAccessControl
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.signed-CtsSecureElementAccessControl
index fd20265..a7980d0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.signed-CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.signed-CtsSecureElementAccessControl
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.signed-CtsSecureElementAccessControl'
+NAME = 'cheets_CTS_P.9.0_r17.arm.signed-CtsSecureElementAccessControl'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.signed-CtsSecureElementAccessControl',
-        test_name='cheets_CTS_P.9.0_r16.arm.signed-CtsSecureElementAccessControl',
+        tag='9.0_r17.arm.signed-CtsSecureElementAccessControl',
+        test_name='cheets_CTS_P.9.0_r17.arm.signed-CtsSecureElementAccessControl',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='signed-CtsSecureElementAccessControl',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.tradefed-run-collect-tests-only-internal
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.tradefed-run-collect-tests-only-internal
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.tradefed-run-collect-tests-only-internal
index 1de6223..4065d01 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.tradefed-run-collect-tests-only-internal
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_CTS_P.9.0_r17.arm.tradefed-run-collect-tests-only-internal'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=0,
-        tag='9.0_r16.arm.tradefed-run-collect-tests-only-internal',
-        test_name='cheets_CTS_P.9.0_r16.arm.tradefed-run-collect-tests-only-internal',
+        tag='9.0_r17.arm.tradefed-run-collect-tests-only-internal',
+        test_name='cheets_CTS_P.9.0_r17.arm.tradefed-run-collect-tests-only-internal',
         run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'CtsMediaTestCases:skip-media-download:true', '--module-arg', 'CtsMediaStressTestCases:skip-media-download:true', '--module-arg', 'CtsMediaBitstreamsTestCases:skip-media-download:true', '--dynamic-config-url='],
         retry_template=None,
         target_module=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.vm-tests-tf
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.vm-tests-tf
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.vm-tests-tf
index d443dc0..11beb1f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.vm-tests-tf
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.vm-tests-tf'
+NAME = 'cheets_CTS_P.9.0_r17.arm.vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.vm-tests-tf',
-        test_name='cheets_CTS_P.9.0_r16.arm.vm-tests-tf',
+        tag='9.0_r17.arm.vm-tests-tf',
+        test_name='cheets_CTS_P.9.0_r17.arm.vm-tests-tf',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'vm-tests-tf', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='vm-tests-tf',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.wm-presubmit b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.wm-presubmit
similarity index 92%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.arm.wm-presubmit
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.arm.wm-presubmit
index 349c364..5c494f4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.arm.wm-presubmit
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.wm-presubmit
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.arm.wm-presubmit'
+NAME = 'cheets_CTS_P.9.0_r17.arm.wm-presubmit'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:smoke'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.arm.wm-presubmit',
-        test_name='cheets_CTS_P.9.0_r16.arm.wm-presubmit',
+        tag='9.0_r17.arm.wm-presubmit',
+        test_name='cheets_CTS_P.9.0_r17.arm.wm-presubmit',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--include-filter', 'CtsAppTestCases android.app.cts.TaskDescriptionTest', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--test-arg', 'com.android.compatibility.common.tradefed.testtype.JarHostTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.AndroidJUnitTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.HostTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.AndroidJUnitTest:exclude-annotation:androidx.test.filters.FlakyTest', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='wm-presubmit',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAbiOverrideHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAbiOverrideHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAbiOverrideHostTestCases
index b0a3f88..bf73b62 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAbiOverrideHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsAbiOverrideHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAbiOverrideHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsAbiOverrideHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsAbiOverrideHostTestCases',
+        tag='9.0_r17.x86.CtsAbiOverrideHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsAbiOverrideHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAbiOverrideHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAbiOverrideHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccelerationTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAccelerationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccelerationTestCases
index f21f73e..223a202 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccelerationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsAccelerationTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAccelerationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsAccelerationTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsAccelerationTestCases',
+        tag='9.0_r17.x86.CtsAccelerationTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsAccelerationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccelerationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAccelerationTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAccessibility b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccessibility
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAccessibility
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccessibility
index ea35b12..0c67de2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccessibility
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsAccessibility'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAccessibility'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsAccessibility',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsAccessibility',
+        tag='9.0_r17.x86.CtsAccessibility',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsAccessibility',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--include-filter', 'CtsAccessibilityTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAccessibility',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccountManagerTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccountManagerTestCases
index c2652da..7691cb8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccountManagerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsAccountManagerTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsAccountManagerTestCases',
+        tag='9.0_r17.x86.CtsAccountManagerTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsAccountManagerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccountManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAccountManagerTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsActivityManagerDevice
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsActivityManagerDevice
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsActivityManagerDevice
index c492c40..b123e4f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsActivityManagerDevice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsActivityManagerDevice'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsActivityManagerDevice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsActivityManagerDevice',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsActivityManagerDevice',
+        tag='9.0_r17.x86.CtsActivityManagerDevice',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsActivityManagerDevice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsActivityManagerDevice',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAdmin b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAdmin
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAdmin
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAdmin
index 7167963..fcd4a27 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAdmin
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAdmin
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsAdmin'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAdmin'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsAdmin',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsAdmin',
+        tag='9.0_r17.x86.CtsAdmin',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsAdmin',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAdmin',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAlarm b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAlarm
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAlarm
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAlarm
index 478c8ab..490e3a0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAlarm
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAlarm
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsAlarm'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAlarm'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsAlarm',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsAlarm',
+        tag='9.0_r17.x86.CtsAlarm',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsAlarm',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAlarm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAndroid b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAndroid
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAndroid
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAndroid
index bb44a6e..1d11eb6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAndroid
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAndroid
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsAndroid'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAndroid'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsAndroid',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsAndroid',
+        tag='9.0_r17.x86.CtsAndroid',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsAndroid',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAndroid',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAnimationTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAnimationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAnimationTestCases
index 7210d02..f35199a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAnimationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsAnimationTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAnimationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsAnimationTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsAnimationTestCases',
+        tag='9.0_r17.x86.CtsAnimationTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsAnimationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAnimationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAnimationTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsApacheHttpLegacy b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApacheHttpLegacy
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsApacheHttpLegacy
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApacheHttpLegacy
index b688658..84b01a6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsApacheHttpLegacy
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApacheHttpLegacy
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsApacheHttpLegacy'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsApacheHttpLegacy'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsApacheHttpLegacy',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsApacheHttpLegacy',
+        tag='9.0_r17.x86.CtsApacheHttpLegacy',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsApacheHttpLegacy',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsApacheHttpLegacy',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsApp b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApp
similarity index 92%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsApp
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApp
index 45ef6cd..505f7d9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsApp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsApp'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsApp'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         enable_default_apps=True,
-        tag='9.0_r16.x86.CtsApp',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsApp',
+        tag='9.0_r17.x86.CtsApp',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsApp',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsApp',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAslrMallocTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAslrMallocTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAslrMallocTestCases
index e6cdf4e..84480a3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAslrMallocTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsAslrMallocTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAslrMallocTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsAslrMallocTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsAslrMallocTestCases',
+        tag='9.0_r17.x86.CtsAslrMallocTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsAslrMallocTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAslrMallocTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAslrMallocTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAssistTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAssistTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAssistTestCases
index f863fd3..04ed567 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAssistTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsAssistTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAssistTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsAssistTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsAssistTestCases',
+        tag='9.0_r17.x86.CtsAssistTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsAssistTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAssistTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAssistTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAtraceHostTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAtraceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAtraceHostTestCases
index 6d107ca..93ccd11 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAtraceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsAtraceHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAtraceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsAtraceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsAtraceHostTestCases',
+        tag='9.0_r17.x86.CtsAtraceHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsAtraceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAtraceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAtraceHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAutoFillServiceTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAutoFillServiceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAutoFillServiceTestCases
index a45af54..a6f9b4e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAutoFillServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsAutoFillServiceTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAutoFillServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsAutoFillServiceTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsAutoFillServiceTestCases',
+        tag='9.0_r17.x86.CtsAutoFillServiceTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsAutoFillServiceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAutoFillServiceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAutoFillServiceTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackgroundRestrictionsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBackgroundRestrictionsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackgroundRestrictionsTestCases
index 5c39257..f0b28a9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackgroundRestrictionsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsBackgroundRestrictionsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsBackgroundRestrictionsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsBackgroundRestrictionsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsBackgroundRestrictionsTestCases',
+        tag='9.0_r17.x86.CtsBackgroundRestrictionsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsBackgroundRestrictionsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBackgroundRestrictionsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBackgroundRestrictionsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBackup b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackup
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBackup
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackup
index 2cc129d..15c42cc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBackup
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackup
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsBackup'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsBackup'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsBackup',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsBackup',
+        tag='9.0_r17.x86.CtsBackup',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsBackup',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBackup',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBatterySavingTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBatterySavingTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBatterySavingTestCases
index 8f985e0..700cd62 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBatterySavingTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsBatterySavingTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsBatterySavingTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsBatterySavingTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsBatterySavingTestCases',
+        tag='9.0_r17.x86.CtsBatterySavingTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsBatterySavingTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBatterySavingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBatterySavingTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBionicTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBionicTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBionicTestCases
index e58b217..ccc79f8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBionicTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsBionicTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsBionicTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsBionicTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsBionicTestCases',
+        tag='9.0_r17.x86.CtsBionicTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsBionicTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBionicTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBionicTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBluetoothTestCases
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBluetoothTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBluetoothTestCases
index 605771c..3ae090f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBluetoothTestCases
@@ -7,7 +7,7 @@
 from autotest_lib.server import utils
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsBluetoothTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsBluetoothTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -33,8 +33,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsBluetoothTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsBluetoothTestCases',
+        tag='9.0_r17.x86.CtsBluetoothTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsBluetoothTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBluetoothTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBluetoothTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBootStatsTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBootStatsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBootStatsTestCases
index ec60f7f..3ebb9af 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBootStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsBootStatsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsBootStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsBootStatsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsBootStatsTestCases',
+        tag='9.0_r17.x86.CtsBootStatsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsBootStatsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBootStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBootStatsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCalendarcommon2TestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCalendarcommon2TestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCalendarcommon2TestCases
index eddcd6d..bf6cde8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCalendarcommon2TestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsCalendarcommon2TestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCalendarcommon2TestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsCalendarcommon2TestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsCalendarcommon2TestCases',
+        tag='9.0_r17.x86.CtsCalendarcommon2TestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsCalendarcommon2TestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCalendarcommon2TestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCalendarcommon2TestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCamera b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCamera
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCamera
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCamera
index 8943df4..be3aa42 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCamera
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsCamera'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCamera'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsCamera',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsCamera',
+        tag='9.0_r17.x86.CtsCamera',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsCamera',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCamera',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCameraTestCases.noled.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCameraTestCases.noled.camerabox.back
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back
index c791bfe..d862f02 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCameraTestCases.noled.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsCameraTestCases.noled.camerabox.back'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86, camerabox_light:noled, camerabox_facing:back'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         cmdline_args=args,
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsCameraTestCases.noled.camerabox.back',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsCameraTestCases.noled.camerabox.back',
+        tag='9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCameraTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCameraTestCases.noled.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCameraTestCases.noled.camerabox.front
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front
index ed245e2..48bd7ac 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCameraTestCases.noled.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsCameraTestCases.noled.camerabox.front'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86, camerabox_light:noled, camerabox_facing:front'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         cmdline_args=args,
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsCameraTestCases.noled.camerabox.front',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsCameraTestCases.noled.camerabox.front',
+        tag='9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCameraTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCarTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarTestCases
index c67a46b..8041db7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsCarTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCarTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsCarTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsCarTestCases',
+        tag='9.0_r17.x86.CtsCarTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsCarTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCarTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarrierApiTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCarrierApiTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarrierApiTestCases
index 7ed1e7d..e58dca0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarrierApiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsCarrierApiTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCarrierApiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsCarrierApiTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsCarrierApiTestCases',
+        tag='9.0_r17.x86.CtsCarrierApiTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsCarrierApiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarrierApiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCarrierApiTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsColorModeTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsColorModeTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsColorModeTestCases
index a8650fd..ef8e6c4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsColorModeTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsColorModeTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsColorModeTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsColorModeTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsColorModeTestCases',
+        tag='9.0_r17.x86.CtsColorModeTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsColorModeTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsColorModeTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsColorModeTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCompilationTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCompilationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCompilationTestCases
index f4fc402..f6806b5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCompilationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsCompilationTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCompilationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsCompilationTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsCompilationTestCases',
+        tag='9.0_r17.x86.CtsCompilationTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsCompilationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCompilationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCompilationTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContactsProviderWipe
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsContactsProviderWipe
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContactsProviderWipe
index 12912db..d601de0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContactsProviderWipe
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsContactsProviderWipe'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsContactsProviderWipe'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsContactsProviderWipe',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsContactsProviderWipe',
+        tag='9.0_r17.x86.CtsContactsProviderWipe',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsContactsProviderWipe',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContactsProviderWipe', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsContactsProviderWipe',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContentTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsContentTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContentTestCases
index e7bdaa9..ad22ae4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsContentTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsContentTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         enable_default_apps=True,
-        tag='9.0_r16.x86.CtsContentTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsContentTestCases',
+        tag='9.0_r17.x86.CtsContentTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsContentTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsContentTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCppToolsTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCppToolsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCppToolsTestCases
index 8aec38d..18b2d88 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCppToolsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsCppToolsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCppToolsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsCppToolsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsCppToolsTestCases',
+        tag='9.0_r17.x86.CtsCppToolsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsCppToolsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCppToolsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCppToolsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCurrentApiSignatureTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCurrentApiSignatureTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCurrentApiSignatureTestCases
index ce90b52..4e173e5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCurrentApiSignatureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsCurrentApiSignatureTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCurrentApiSignatureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsCurrentApiSignatureTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsCurrentApiSignatureTestCases',
+        tag='9.0_r17.x86.CtsCurrentApiSignatureTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsCurrentApiSignatureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCurrentApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCurrentApiSignatureTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDatabaseTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDatabaseTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDatabaseTestCases
index 05b1743..9626545 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDatabaseTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDatabaseTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDatabaseTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDatabaseTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDatabaseTestCases',
+        tag='9.0_r17.x86.CtsDatabaseTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDatabaseTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDatabaseTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDatabaseTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDebugTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDebugTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDebugTestCases
index ff3cf47..1cf1b19 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDebugTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDebugTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDebugTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDebugTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDebugTestCases',
+        tag='9.0_r17.x86.CtsDebugTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDebugTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDebugTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.32
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.32
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.32
index 4906610..2b9a96a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.32
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDeqpTestCases.32'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.32'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-deqp, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r16.x86.CtsDeqpTestCases.32',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDeqpTestCases.32',
+        tag='9.0_r17.x86.CtsDeqpTestCases.32',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.32',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'x86', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.64
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.64
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.64
index dd15cd8..60de5c8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.64
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDeqpTestCases.64'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.64'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-deqp, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r16.x86.CtsDeqpTestCases.64',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDeqpTestCases.64',
+        tag='9.0_r17.x86.CtsDeqpTestCases.64',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.64',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'x86_64', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-EGL
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL
index 657126e..05a4b74 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDeqpTestCases.dEQP-EGL'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDeqpTestCases.dEQP-EGL',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDeqpTestCases.dEQP-EGL',
+        tag='9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-EGL.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES2
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES2
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES2
index 1f83bf2..04eefd0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES2
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES2'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES2'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES2',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES2',
+        tag='9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES2',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES2',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES2.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES3
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3
index c77a7fd..3fd3912 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES3'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES3',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES3',
+        tag='9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES31
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31
index 0ca51d9..b6ae233 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES31'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES31',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDeqpTestCases.dEQP-GLES31',
+        tag='9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES31.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-VK b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-VK
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-VK
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-VK
index ae4afdf..2b01b68 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDeqpTestCases.dEQP-VK
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-VK
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDeqpTestCases.dEQP-VK'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-VK'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDeqpTestCases.dEQP-VK',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDeqpTestCases.dEQP-VK',
+        tag='9.0_r17.x86.CtsDeqpTestCases.dEQP-VK',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-VK',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-VK.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDevice b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDevice
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDevice
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDevice
index 822e33e..d359a6f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDevice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDevice'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDevice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDevice',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDevice',
+        tag='9.0_r17.x86.CtsDevice',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDevice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDevice',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDexMetadataHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDexMetadataHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDexMetadataHostTestCases
index 2795430..1a9e46d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDexMetadataHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDexMetadataHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDexMetadataHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDexMetadataHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDexMetadataHostTestCases',
+        tag='9.0_r17.x86.CtsDexMetadataHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDexMetadataHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDexMetadataHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDexMetadataHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDisplayTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDisplayTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDisplayTestCases
index fb7d1c8..de119bf 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDisplayTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDisplayTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDisplayTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDisplayTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDisplayTestCases',
+        tag='9.0_r17.x86.CtsDisplayTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDisplayTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDisplayTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDisplayTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDpi b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDpi
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDpi
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDpi
index 86b5e31..5130e99 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDpi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDpi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDpi'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDpi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDpi',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDpi',
+        tag='9.0_r17.x86.CtsDpi',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDpi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDpi',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDreamsTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDreamsTestCases
index 186376a..d97f4d1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDreamsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDreamsTestCases',
+        tag='9.0_r17.x86.CtsDreamsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDreamsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDreamsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDrmTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDrmTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDrmTestCases
index b8bbc0a..ca10e9a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDrmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDrmTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDrmTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDrmTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDrmTestCases',
+        tag='9.0_r17.x86.CtsDrmTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDrmTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDrmTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDrmTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDumpsysHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDumpsysHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDumpsysHostTestCases
index 15b764c..c06e4ae 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDumpsysHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDumpsysHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDumpsysHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDumpsysHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDumpsysHostTestCases',
+        tag='9.0_r17.x86.CtsDumpsysHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDumpsysHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDumpsysHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDumpsysHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDynamicLinkerTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDynamicLinkerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDynamicLinkerTestCases
index 56f3bd8..8f070e7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDynamicLinkerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsDynamicLinkerTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDynamicLinkerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsDynamicLinkerTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsDynamicLinkerTestCases',
+        tag='9.0_r17.x86.CtsDynamicLinkerTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsDynamicLinkerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDynamicLinkerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDynamicLinkerTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEdiHostTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsEdiHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEdiHostTestCases
index 56c0f64..d1249e4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEdiHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsEdiHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsEdiHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsEdiHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsEdiHostTestCases',
+        tag='9.0_r17.x86.CtsEdiHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsEdiHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEdiHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsEdiHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEffectTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsEffectTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEffectTestCases
index 42cfb75..b178cf7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEffectTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsEffectTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsEffectTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsEffectTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsEffectTestCases',
+        tag='9.0_r17.x86.CtsEffectTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsEffectTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEffectTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsEffectTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsExternalS b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsExternalS
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsExternalS
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsExternalS
index 84f91f1..4316947 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsExternalS
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsExternalS
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsExternalS'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsExternalS'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsExternalS',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsExternalS',
+        tag='9.0_r17.x86.CtsExternalS',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsExternalS',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsExternalS',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFileSystemTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFileSystemTestCases
index e9a3911..adda90c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFileSystemTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsFileSystemTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsFileSystemTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsFileSystemTestCases',
+        tag='9.0_r17.x86.CtsFileSystemTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsFileSystemTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsFileSystemTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsFragment b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFragment
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsFragment
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFragment
index 06b9553..0e1d8a4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsFragment
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFragment
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsFragment'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsFragment'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsFragment',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsFragment',
+        tag='9.0_r17.x86.CtsFragment',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsFragment',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsFragment',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGestureTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsGestureTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGestureTestCases
index b0e4c3f..67c874e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGestureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsGestureTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsGestureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsGestureTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsGestureTestCases',
+        tag='9.0_r17.x86.CtsGestureTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsGestureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGestureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsGestureTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGpuToolsHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsGpuToolsHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGpuToolsHostTestCases
index 0dba1a1..f261a61 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGpuToolsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsGpuToolsHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsGpuToolsHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsGpuToolsHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsGpuToolsHostTestCases',
+        tag='9.0_r17.x86.CtsGpuToolsHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsGpuToolsHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGpuToolsHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsGpuToolsHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGraphicsTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsGraphicsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGraphicsTestCases
index feeb3bd..36610ef 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGraphicsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsGraphicsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsGraphicsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=5,
-        tag='9.0_r16.x86.CtsGraphicsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsGraphicsTestCases',
+        tag='9.0_r17.x86.CtsGraphicsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsGraphicsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGraphicsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsGraphicsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHardwareTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHardwareTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHardwareTestCases
index 014effe..7272953 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHardwareTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsHardwareTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsHardwareTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational3'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsHardwareTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsHardwareTestCases',
+        tag='9.0_r17.x86.CtsHardwareTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsHardwareTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHardwareTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHardwareTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHarmfulAppWarningHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHarmfulAppWarningHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHarmfulAppWarningHostTestCases
index 39fce7a..c6955d6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHarmfulAppWarningHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsHarmfulAppWarningHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsHarmfulAppWarningHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsHarmfulAppWarningHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsHarmfulAppWarningHostTestCases',
+        tag='9.0_r17.x86.CtsHarmfulAppWarningHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsHarmfulAppWarningHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHarmfulAppWarningHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHarmfulAppWarningHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHiddenApi b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHiddenApi
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHiddenApi
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHiddenApi
index a603293..06f92eb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHiddenApi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHiddenApi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsHiddenApi'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsHiddenApi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsHiddenApi',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsHiddenApi',
+        tag='9.0_r17.x86.CtsHiddenApi',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsHiddenApi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHiddenApi',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostTzDataTests
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHostTzDataTests
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostTzDataTests
index 7eb1556..3d77098 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostTzDataTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsHostTzDataTests'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsHostTzDataTests'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsHostTzDataTests',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsHostTzDataTests',
+        tag='9.0_r17.x86.CtsHostTzDataTests',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsHostTzDataTests',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHostTzDataTests', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHostTzDataTests',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHostside b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostside
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHostside
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostside
index 163f62e..b4988f2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsHostside
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostside
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsHostside'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsHostside'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsHostside',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsHostside',
+        tag='9.0_r17.x86.CtsHostside',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsHostside',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHostside',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIcuTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsIcuTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIcuTestCases
index c765144..c8a1251 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIcuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsIcuTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsIcuTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsIcuTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsIcuTestCases',
+        tag='9.0_r17.x86.CtsIcuTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsIcuTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIcuTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsIcuTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIncidentHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsIncidentHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIncidentHostTestCases
index 6fa1faf..ffa3330 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIncidentHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsIncidentHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsIncidentHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsIncidentHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsIncidentHostTestCases',
+        tag='9.0_r17.x86.CtsIncidentHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsIncidentHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIncidentHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsIncidentHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInlineMockingTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsInlineMockingTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInlineMockingTestCases
index 69c1569..70ac7db 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInlineMockingTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsInlineMockingTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsInlineMockingTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsInlineMockingTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsInlineMockingTestCases',
+        tag='9.0_r17.x86.CtsInlineMockingTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsInlineMockingTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsInlineMockingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsInlineMockingTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsInputMethod b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInputMethod
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsInputMethod
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInputMethod
index d2e8eb2..08a88f9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsInputMethod
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInputMethod
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsInputMethod'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsInputMethod'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsInputMethod',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsInputMethod',
+        tag='9.0_r17.x86.CtsInputMethod',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsInputMethod',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsInputMethod',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsIntentSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIntentSignatureTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsIntentSignatureTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIntentSignatureTestCases
index c849545..17212e8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsIntentSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIntentSignatureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsIntentSignatureTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsIntentSignatureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsIntentSignatureTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsIntentSignatureTestCases',
+        tag='9.0_r17.x86.CtsIntentSignatureTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsIntentSignatureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIntentSignatureTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsIntentSignatureTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJankDeviceTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJankDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJankDeviceTestCases
index c132698..0b9d902 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJankDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsJankDeviceTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsJankDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsJankDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsJankDeviceTestCases',
+        tag='9.0_r17.x86.CtsJankDeviceTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsJankDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJankDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJankDeviceTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJdwp b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJdwp
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJdwp
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJdwp
index cafdf58..29d2fec 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJdwp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJdwp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsJdwp'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsJdwp'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsJdwp',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsJdwp',
+        tag='9.0_r17.x86.CtsJdwp',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsJdwp',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJdwp',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJniTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJniTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJniTestCases
index 999750e..eb82144 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJniTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsJniTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsJniTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsJniTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsJniTestCases',
+        tag='9.0_r17.x86.CtsJniTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsJniTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJniTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJniTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJobScheduler b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJobScheduler
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJobScheduler
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJobScheduler
index b2564fe..00066a5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJobScheduler
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJobScheduler
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsJobScheduler'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsJobScheduler'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsJobScheduler',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsJobScheduler',
+        tag='9.0_r17.x86.CtsJobScheduler',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsJobScheduler',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJobScheduler',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJvmti b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJvmti
similarity index 98%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJvmti
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJvmti
index 1968c4c..97e3fa2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsJvmti
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJvmti
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsJvmti'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsJvmti'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsJvmti',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsJvmti',
+        tag='9.0_r17.x86.CtsJvmti',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsJvmti',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJvmti',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKernelConfigTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsKernelConfigTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKernelConfigTestCases
index dee450c..6090977 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKernelConfigTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsKernelConfigTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsKernelConfigTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsKernelConfigTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsKernelConfigTestCases',
+        tag='9.0_r17.x86.CtsKernelConfigTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsKernelConfigTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKernelConfigTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsKernelConfigTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKeystoreTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsKeystoreTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKeystoreTestCases
index b41f002..eaf3294 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKeystoreTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsKeystoreTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsKeystoreTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsKeystoreTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsKeystoreTestCases',
+        tag='9.0_r17.x86.CtsKeystoreTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsKeystoreTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKeystoreTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsKeystoreTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLeanbackJankTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLeanbackJankTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLeanbackJankTestCases
index 40d6659..1cf7af0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLeanbackJankTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsLeanbackJankTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsLeanbackJankTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsLeanbackJankTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsLeanbackJankTestCases',
+        tag='9.0_r17.x86.CtsLeanbackJankTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsLeanbackJankTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLeanbackJankTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLeanbackJankTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLegacyNotificationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLegacyNotificationTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLegacyNotificationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLegacyNotificationTestCases
index c5b2120..edb33ce 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLegacyNotificationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLegacyNotificationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsLegacyNotificationTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsLegacyNotificationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsLegacyNotificationTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsLegacyNotificationTestCases',
+        tag='9.0_r17.x86.CtsLegacyNotificationTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsLegacyNotificationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLegacyNotificationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLegacyNotificationTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLibcore b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLibcore
similarity index 92%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLibcore
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLibcore
index 921dec0..c67a70d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLibcore
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLibcore
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsLibcore'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsLibcore'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1, suite:vmtest-informational3'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsLibcore',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsLibcore',
+        tag='9.0_r17.x86.CtsLibcore',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsLibcore',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLibcore',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLiblogTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLiblogTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLiblogTestCases
index e46f6af..220cbe5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLiblogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsLiblogTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsLiblogTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsLiblogTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsLiblogTestCases',
+        tag='9.0_r17.x86.CtsLiblogTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsLiblogTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLiblogTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLiblogTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLocation b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLocation
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLocation
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLocation
index c98c8d3..5879bc0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLocation
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLocation
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsLocation'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsLocation'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsLocation',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsLocation',
+        tag='9.0_r17.x86.CtsLocation',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsLocation',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLocation',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLogdTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLogdTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLogdTestCases
index f743abd..bbf39b3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLogdTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsLogdTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsLogdTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsLogdTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsLogdTestCases',
+        tag='9.0_r17.x86.CtsLogdTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsLogdTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLogdTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLogdTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaBitstreamsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaBitstreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaBitstreamsTestCases
index 08c2bbe..0dc819e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaBitstreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsMediaBitstreamsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaBitstreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r16.x86.CtsMediaBitstreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsMediaBitstreamsTestCases',
+        tag='9.0_r17.x86.CtsMediaBitstreamsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaBitstreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaBitstreamsTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaBitstreamsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaHostTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaHostTestCases
index 9601302..e7d6b75 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsMediaHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsMediaHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsMediaHostTestCases',
+        tag='9.0_r17.x86.CtsMediaHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMediaHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaStressTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases
index 990cd38..b0813b7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsMediaStressTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaStressTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational2'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r16.x86.CtsMediaStressTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsMediaStressTestCases',
+        tag='9.0_r17.x86.CtsMediaStressTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaStressTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaStressTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.32
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaTestCases.32
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.32
index bdf812f..1802d4d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.32
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsMediaTestCases.32'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.32'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational2'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r16.x86.CtsMediaTestCases.32',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsMediaTestCases.32',
+        tag='9.0_r17.x86.CtsMediaTestCases.32',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.32',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure', '--abi', 'x86'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.64
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaTestCases.64
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.64
index 0c2e044..4c0ee63 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.64
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsMediaTestCases.64'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.64'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational2'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r16.x86.CtsMediaTestCases.64',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsMediaTestCases.64',
+        tag='9.0_r17.x86.CtsMediaTestCases.64',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.64',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure', '--abi', 'x86_64'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaTestCases.audio b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.audio
similarity index 94%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaTestCases.audio
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.audio
index 399cb61..c2a45d4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMediaTestCases.audio
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.audio
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsMediaTestCases.audio'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.audio'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r16.x86.CtsMediaTestCases.audio',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsMediaTestCases.audio',
+        tag='9.0_r17.x86.CtsMediaTestCases.audio',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.audio',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioAttributesTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioEffectTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioFocusTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioFormatTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioManagerTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioNativeTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioPlayRoutingNative', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioPlaybackConfigurationTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioPreProcessingTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioPresentationTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioRecordAppOpTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioRecordRoutingNative', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioRecordTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioRecord_BufferSizeTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioRecordingConfigurationTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioTrackLatencyTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioTrackSurroundTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioTrackTest', '--include-filter', 'CtsMediaTestCases android.media.cts.AudioTrack_ListenerTest', '--include-filter', 'CtsMediaTestCases android.media.cts.SoundPoolAacTest', '--include-filter', 'CtsMediaTestCases android.media.cts.SoundPoolMidiTest', '--include-filter', 'CtsMediaTestCases android.media.cts.SoundPoolOggTest', '--include-filter', 'CtsMediaTestCases android.media.cts.VolumeShaperTest', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMidiTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMidiTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMidiTestCases
index 14dc2f3..4019871 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMidiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsMidiTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMidiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsMidiTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsMidiTestCases',
+        tag='9.0_r17.x86.CtsMidiTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsMidiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMidiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMidiTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMocking b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMocking
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMocking
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMocking
index cf8855f..9718345 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMocking
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMocking
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsMocking'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMocking'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsMocking',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsMocking',
+        tag='9.0_r17.x86.CtsMocking',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsMocking',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMocking',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMonkeyTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMonkeyTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMonkeyTestCases
index 32c2748..4e3f141 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMonkeyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsMonkeyTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMonkeyTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsMonkeyTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsMonkeyTestCases',
+        tag='9.0_r17.x86.CtsMonkeyTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsMonkeyTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMonkeyTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMonkeyTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMultiUser b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMultiUser
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMultiUser
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMultiUser
index feef4a7..e7010d3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsMultiUser
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMultiUser
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsMultiUser'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMultiUser'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsMultiUser',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsMultiUser',
+        tag='9.0_r17.x86.CtsMultiUser',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsMultiUser',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMultiUser',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNNAPITestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsNNAPITestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNNAPITestCases
index e7e5689..f3f5aba 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNNAPITestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsNNAPITestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsNNAPITestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsNNAPITestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsNNAPITestCases',
+        tag='9.0_r17.x86.CtsNNAPITestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsNNAPITestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNNAPITestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNNAPITestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsNative b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNative
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsNative
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNative
index 0c7a9ff..5dff547 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsNative
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNative
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsNative'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsNative'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsNative',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsNative',
+        tag='9.0_r17.x86.CtsNative',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsNative',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNative',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNdefTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsNdefTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNdefTestCases
index 7813712..ee4f164 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNdefTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsNdefTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsNdefTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsNdefTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsNdefTestCases',
+        tag='9.0_r17.x86.CtsNdefTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsNdefTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNdefTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNdefTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsNet b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNet
similarity index 95%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsNet
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNet
index c2e2fe4..0985f43 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsNet
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNet
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsNet'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsNet'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsNet',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsNet',
+        tag='9.0_r17.x86.CtsNet',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsNet',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNet',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOmapiTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsOmapiTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOmapiTestCases
index 05855fb..a1d4777 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOmapiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsOmapiTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsOmapiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsOmapiTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsOmapiTestCases',
+        tag='9.0_r17.x86.CtsOmapiTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsOmapiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsOmapiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsOmapiTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsOpenG b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOpenG
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsOpenG
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOpenG
index d49e839..97a69b7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsOpenG
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOpenG
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsOpenG'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsOpenG'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsOpenG',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsOpenG',
+        tag='9.0_r17.x86.CtsOpenG',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsOpenG',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsOpenG',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsOs b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOs
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsOs
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOs
index 3ed3f63..f1d4ede 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsOs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsOs'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsOs'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsOs',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsOs',
+        tag='9.0_r17.x86.CtsOs',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsOs',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsOs',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPdfTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPdfTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPdfTestCases
index 74e297e..07fb966 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPdfTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsPdfTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsPdfTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsPdfTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsPdfTestCases',
+        tag='9.0_r17.x86.CtsPdfTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsPdfTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPdfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPdfTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPerfettoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases
index f3f4e0c..0a0aa8c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsPerfettoTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsPerfettoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsPerfettoTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsPerfettoTestCases',
+        tag='9.0_r17.x86.CtsPerfettoTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsPerfettoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPerfettoTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPermission b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermission
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPermission
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermission
index 52f71a3..8af9141 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPermission
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsPermission'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsPermission'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsPermission',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsPermission',
+        tag='9.0_r17.x86.CtsPermission',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsPermission',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPermission',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPreference b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPreference
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPreference
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPreference
index ffecaca..41a4ec2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPreference
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPreference
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsPreference'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsPreference'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsPreference',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsPreference',
+        tag='9.0_r17.x86.CtsPreference',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsPreference',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPreference',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPrintTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPrintTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPrintTestCases
index 2247ccc..3d7b7bb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPrintTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsPrintTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsPrintTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsPrintTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsPrintTestCases',
+        tag='9.0_r17.x86.CtsPrintTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsPrintTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPrintTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPrintTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProtoTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsProtoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProtoTestCases
index 5dd4400..bc90f90 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProtoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsProtoTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsProtoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsProtoTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsProtoTestCases',
+        tag='9.0_r17.x86.CtsProtoTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsProtoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProtoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsProtoTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProviderTestCases
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsProviderTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProviderTestCases
index a5e0c1b..1547875 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProviderTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsProviderTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsProviderTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsProviderTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsProviderTestCases',
+        tag='9.0_r17.x86.CtsProviderTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsProviderTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProviderTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsProviderTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsRenderscript b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRenderscript
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsRenderscript
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRenderscript
index 310bff6..b49f786 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsRenderscript
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRenderscript
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsRenderscript'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsRenderscript'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsRenderscript',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsRenderscript',
+        tag='9.0_r17.x86.CtsRenderscript',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsRenderscript',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsRenderscript',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsRs b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRs
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsRs
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRs
index 469fc4f..597eac7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsRs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsRs'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsRs'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsRs',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsRs',
+        tag='9.0_r17.x86.CtsRs',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsRs',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsRs',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSample b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSample
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSample
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSample
index bd9258d..93b47a4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSample
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSample
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSample'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSample'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSample',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSample',
+        tag='9.0_r17.x86.CtsSample',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSample',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSample',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSaxTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSaxTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSaxTestCases
index a1fdcb4..e5f15e2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSaxTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSaxTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSaxTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSaxTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSaxTestCases',
+        tag='9.0_r17.x86.CtsSaxTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSaxTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSaxTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSaxTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSeccompHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSeccompHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSeccompHostTestCases
index f9dfebd..491c796 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSeccompHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSeccompHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSeccompHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSeccompHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSeccompHostTestCases',
+        tag='9.0_r17.x86.CtsSeccompHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSeccompHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSeccompHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSeccompHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecureElementAccessControl
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSecureElementAccessControl
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecureElementAccessControl
index 1c420c7..17e2466 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecureElementAccessControl
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSecureElementAccessControl'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSecureElementAccessControl'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSecureElementAccessControl',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSecureElementAccessControl',
+        tag='9.0_r17.x86.CtsSecureElementAccessControl',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSecureElementAccessControl',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSecureElementAccessControl',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSecurity b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecurity
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSecurity
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecurity
index b7a8d41..50bdc50 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSecurity
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecurity
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSecurity'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSecurity'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSecurity',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSecurity',
+        tag='9.0_r17.x86.CtsSecurity',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSecurity',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--include-filter', 'CtsSecurityHostTestCases', '--include-filter', 'CtsSecurityTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSecurity',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSelinuxTargetSdk b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSelinuxTargetSdk
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSelinuxTargetSdk
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSelinuxTargetSdk
index 8f0f94d..0aedb01 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSelinuxTargetSdk
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSelinuxTargetSdk
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSelinuxTargetSdk'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSelinuxTargetSdk'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSelinuxTargetSdk',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSelinuxTargetSdk',
+        tag='9.0_r17.x86.CtsSelinuxTargetSdk',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSelinuxTargetSdk',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSelinuxTargetSdk',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSensorTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases
index ecafd35..3899067 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSensorTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSensorTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r16.x86.CtsSensorTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSensorTestCases',
+        tag='9.0_r17.x86.CtsSensorTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSensorTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSensorTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsShortcut b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsShortcut
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsShortcut
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsShortcut
index 4c1a2c5..ff4131b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsShortcut
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsShortcut
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsShortcut'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsShortcut'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsShortcut',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsShortcut',
+        tag='9.0_r17.x86.CtsShortcut',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsShortcut',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsShortcut',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSimRestrictedApisTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimRestrictedApisTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSimRestrictedApisTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimRestrictedApisTestCases
index 81d614c..a43ce37 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSimRestrictedApisTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimRestrictedApisTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSimRestrictedApisTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSimRestrictedApisTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSimRestrictedApisTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSimRestrictedApisTestCases',
+        tag='9.0_r17.x86.CtsSimRestrictedApisTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSimRestrictedApisTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimRestrictedApisTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSimRestrictedApisTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleCpuTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSimpleCpuTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleCpuTestCases
index a4f7e21..ab1ddff 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleCpuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSimpleCpuTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSimpleCpuTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSimpleCpuTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSimpleCpuTestCases',
+        tag='9.0_r17.x86.CtsSimpleCpuTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSimpleCpuTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleCpuTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSimpleCpuTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleperfTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSimpleperfTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleperfTestCases
index b4bf28b..fc447ee 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleperfTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSimpleperfTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSimpleperfTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSimpleperfTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSimpleperfTestCases',
+        tag='9.0_r17.x86.CtsSimpleperfTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSimpleperfTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleperfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSimpleperfTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSkQPTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSkQPTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSkQPTestCases
index 52c7cf7..68b45ca 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSkQPTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSkQPTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSkQPTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSkQPTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSkQPTestCases',
+        tag='9.0_r17.x86.CtsSkQPTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSkQPTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSkQPTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSkQPTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSliceTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSliceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSliceTestCases
index dccf624..e4dff1d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSliceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSliceTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSliceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSliceTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSliceTestCases',
+        tag='9.0_r17.x86.CtsSliceTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSliceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSliceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSliceTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSpeechTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSpeechTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSpeechTestCases
index acefc98..71b5ed6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSpeechTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSpeechTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSpeechTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSpeechTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSpeechTestCases',
+        tag='9.0_r17.x86.CtsSpeechTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSpeechTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSpeechTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSpeechTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsStatsdHostTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsStatsdHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsStatsdHostTestCases
index f8712da..d9de2f4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsStatsdHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsStatsdHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsStatsdHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsStatsdHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsStatsdHostTestCases',
+        tag='9.0_r17.x86.CtsStatsdHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsStatsdHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsStatsdHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsStatsdHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSustainedPerformanceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases
index 784e754..a103646 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSustainedPerformanceHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSustainedPerformanceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSustainedPerformanceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSustainedPerformanceHostTestCases',
+        tag='9.0_r17.x86.CtsSustainedPerformanceHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSustainedPerformanceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSustainedPerformanceHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSync b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSync
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSync
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSync
index d795f41..b7ac751 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSync
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSync
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSync'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSync'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSync',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSync',
+        tag='9.0_r17.x86.CtsSync',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSync',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSync',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSystem b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSystem
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSystem
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSystem
index d076b69..cb974ff 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsSystem
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSystem
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsSystem'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSystem'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsSystem',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsSystem',
+        tag='9.0_r17.x86.CtsSystem',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsSystem',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSystem',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTelecom b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelecom
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTelecom
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelecom
index 90badb8..54fa8e3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTelecom
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelecom
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsTelecom'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsTelecom'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsTelecom',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsTelecom',
+        tag='9.0_r17.x86.CtsTelecom',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsTelecom',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTelecom',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTelephony b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelephony
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTelephony
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelephony
index ec1b2fd..2d66583 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTelephony
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelephony
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsTelephony'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsTelephony'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsTelephony',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsTelephony',
+        tag='9.0_r17.x86.CtsTelephony',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsTelephony',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTelephony',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTextTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTextTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTextTestCases
index 4994cbe..2dbb7aa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTextTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsTextTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsTextTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsTextTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsTextTestCases',
+        tag='9.0_r17.x86.CtsTextTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsTextTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTextTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTextTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTheme b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTheme
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTheme
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTheme
index 78a2ce6..593a621 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTheme
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTheme
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsTheme'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsTheme'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1, suite:vmtest-informational3'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsTheme',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsTheme',
+        tag='9.0_r17.x86.CtsTheme',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsTheme',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTheme',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsToast b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsToast
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsToast
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsToast
index 6377b7c..307fa5a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsToast
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsToast
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsToast'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsToast'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsToast',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsToast',
+        tag='9.0_r17.x86.CtsToast',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsToast',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsToast',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTransitionTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTransitionTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTransitionTestCases
index e45bd95..3f0086b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTransitionTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsTransitionTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsTransitionTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsTransitionTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsTransitionTestCases',
+        tag='9.0_r17.x86.CtsTransitionTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsTransitionTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTransitionTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTransitionTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTrustedVoiceHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTrustedVoiceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTrustedVoiceHostTestCases
index 39de272..23a3fd3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTrustedVoiceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsTrustedVoiceHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsTrustedVoiceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsTrustedVoiceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsTrustedVoiceHostTestCases',
+        tag='9.0_r17.x86.CtsTrustedVoiceHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsTrustedVoiceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTrustedVoiceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTrustedVoiceHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTv b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTv
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTv
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTv
index abd91e1..aa97dfd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsTv
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTv
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsTv'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsTv'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsTv',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsTv',
+        tag='9.0_r17.x86.CtsTv',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsTv',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTv',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUi b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUi
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUi
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUi
index 78df902..556de21 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsUi'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsUi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsUi',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsUi',
+        tag='9.0_r17.x86.CtsUi',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsUi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUi',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUidIsolationTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUidIsolationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUidIsolationTestCases
index 140703b..97b74fb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUidIsolationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsUidIsolationTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsUidIsolationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsUidIsolationTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsUidIsolationTestCases',
+        tag='9.0_r17.x86.CtsUidIsolationTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsUidIsolationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUidIsolationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUidIsolationTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUsageStatsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases
index f098203..cb1e481 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsUsageStatsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsUsageStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsUsageStatsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsUsageStatsTestCases',
+        tag='9.0_r17.x86.CtsUsageStatsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsUsageStatsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUsageStatsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsbTests
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUsbTests
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsbTests
index fad04cb..c0c6e90 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsbTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsUsbTests'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsUsbTests'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsUsbTests',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsUsbTests',
+        tag='9.0_r17.x86.CtsUsbTests',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsUsbTests',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsbTests', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUsbTests',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUtilTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUtilTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUtilTestCases
index 9c37edd..10b411d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUtilTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsUtilTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsUtilTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsUtilTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsUtilTestCases',
+        tag='9.0_r17.x86.CtsUtilTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsUtilTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUtilTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUtilTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVideoTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsVideoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVideoTestCases
index a9ae266..332e48d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVideoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsVideoTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsVideoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsVideoTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsVideoTestCases',
+        tag='9.0_r17.x86.CtsVideoTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsVideoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVideoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVideoTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsViewTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases
index 96c55b6..d4c738f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsViewTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsViewTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsViewTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsViewTestCases',
+        tag='9.0_r17.x86.CtsViewTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsViewTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsViewTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVmTestCases
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsVmTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVmTestCases
index 1c37bc3..35fb9a7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsVmTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsVmTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsVmTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsVmTestCases',
+        tag='9.0_r17.x86.CtsVmTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsVmTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVmTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVmTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsVoice b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVoice
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsVoice
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVoice
index 08c469d..ed87741 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsVoice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVoice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsVoice'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsVoice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsVoice',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsVoice',
+        tag='9.0_r17.x86.CtsVoice',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsVoice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVoice',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVrTestCases
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsVrTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVrTestCases
index 1439de4..956fe3f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVrTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsVrTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsVrTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsVrTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsVrTestCases',
+        tag='9.0_r17.x86.CtsVrTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsVrTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVrTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVrTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWebkitTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsWebkitTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWebkitTestCases
index ed1ae01..23a4274 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWebkitTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsWebkitTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsWebkitTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsWebkitTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsWebkitTestCases',
+        tag='9.0_r17.x86.CtsWebkitTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsWebkitTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWebkitTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWebkitTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWidgetTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsWidgetTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWidgetTestCases
index aa68d98..108ef09 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWidgetTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsWidgetTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsWidgetTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsWidgetTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsWidgetTestCases',
+        tag='9.0_r17.x86.CtsWidgetTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsWidgetTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWidgetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWidgetTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWindowManagerDeviceTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsWindowManagerDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWindowManagerDeviceTestCases
index 6f4a036..6d49090 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWindowManagerDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsWindowManagerDeviceTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsWindowManagerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsWindowManagerDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsWindowManagerDeviceTestCases',
+        tag='9.0_r17.x86.CtsWindowManagerDeviceTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsWindowManagerDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWindowManagerDeviceTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsWrap b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWrap
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsWrap
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWrap
index 02292a9..9fc5686 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.CtsWrap
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWrap
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.CtsWrap'
+NAME = 'cheets_CTS_P.9.0_r17.x86.CtsWrap'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.CtsWrap',
-        test_name='cheets_CTS_P.9.0_r16.x86.CtsWrap',
+        tag='9.0_r17.x86.CtsWrap',
+        test_name='cheets_CTS_P.9.0_r17.x86.CtsWrap',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWrap',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
index e9895c3..e7ff66f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
+        tag='9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--include-filter', 'CtsAccelerationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
index 8090abe..f58c7aa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
+        tag='9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccessibilityServiceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
index 5275179..d96775a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
+        tag='9.0_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--include-filter', 'CtsAccountManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
index 80ee3bc..d3d384f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
+        tag='9.0_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
similarity index 95%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
index 1feb298..4480314 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         iterations=1,
         max_retry=9,
         enable_default_apps=True,
-        tag='9.0_r16.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
+        tag='9.0_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--include-filter', 'CtsAnimationTestCases', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--include-filter', 'CtsAslrMallocTestCases', '--include-filter', 'CtsAssistTestCases', '--include-filter', 'CtsAtraceHostTestCases', '--include-filter', 'CtsAutoFillServiceTestCases', '--include-filter', 'CtsBackgroundRestrictionsTestCases', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--include-filter', 'CtsBatterySavingTestCases', '--include-filter', 'CtsBionicTestCases', '--include-filter', 'CtsBluetoothTestCases', '--include-filter', 'CtsBootStatsTestCases', '--include-filter', 'CtsCalendarcommon2TestCases', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--include-filter', 'CtsCarTestCases', '--include-filter', 'CtsCarrierApiTestCases', '--include-filter', 'CtsColorModeTestCases', '--include-filter', 'CtsCompilationTestCases', '--include-filter', 'CtsContactsProviderWipe', '--include-filter', 'CtsContentTestCases', '--include-filter', 'CtsCppToolsTestCases', '--include-filter', 'CtsCurrentApiSignatureTestCases', '--include-filter', 'CtsDatabaseTestCases', '--include-filter', 'CtsDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
index 2bda8e2..6f981f1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r16.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
+        tag='9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'x86', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
index ab249bf..fd35c31 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r16.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
+        tag='9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'x86_64', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
index 7404065..d6c899f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
+        tag='9.0_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--include-filter', 'CtsDexMetadataHostTestCases', '--include-filter', 'CtsDisplayTestCases', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--include-filter', 'CtsDreamsTestCases', '--include-filter', 'CtsDrmTestCases', '--include-filter', 'CtsDumpsysHostTestCases', '--include-filter', 'CtsDynamicLinkerTestCases', '--include-filter', 'CtsEdiHostTestCases', '--include-filter', 'CtsEffectTestCases', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
index dd02ddf..b2d8553 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        tag='9.0_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
similarity index 94%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
index f4e257a..0ed7006 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
+        tag='9.0_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--include-filter', 'CtsGestureTestCases', '--include-filter', 'CtsGpuToolsHostTestCases', '--include-filter', 'CtsGraphicsTestCases', '--include-filter', 'CtsHardwareTestCases', '--include-filter', 'CtsHarmfulAppWarningHostTestCases', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--include-filter', 'CtsHostTzDataTests', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--include-filter', 'CtsIcuTestCases', '--include-filter', 'CtsIncidentHostTestCases', '--include-filter', 'CtsInlineMockingTestCases', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--include-filter', 'CtsIntentSignatureTestCases', '--include-filter', 'CtsJankDeviceTestCases', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--include-filter', 'CtsJniTestCases', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
similarity index 98%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
index 9357243..c0eb21e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
+        tag='9.0_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--include-filter', 'CtsKernelConfigTestCases', '--include-filter', 'CtsKeystoreTestCases', '--include-filter', 'CtsLeanbackJankTestCases', '--include-filter', 'CtsLegacyNotificationTestCases', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--include-filter', 'CtsLiblogTestCases', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--include-filter', 'CtsLogdTestCases', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
index f37602c..1c4c4c6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r16.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
+        tag='9.0_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaBitstreamsTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
index 54b9d97..468cbac 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
+        tag='9.0_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
index 770da43..59cbe54 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r16.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
+        tag='9.0_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32
index 990539c..d82e386 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r16.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32',
+        tag='9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure', '--abi', 'x86'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsMediaTestCases_-_CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64
index 1b393a6..f1988a0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r16.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64',
+        tag='9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure', '--abi', 'x86_64'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsMediaTestCases_-_CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
similarity index 96%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
index 51c5d88..388bd75 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
+        tag='9.0_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--include-filter', 'CtsMonkeyTestCases', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--include-filter', 'CtsNNAPITestCases', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--include-filter', 'CtsNdefTestCases', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--include-filter', 'CtsOmapiTestCases', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--include-filter', 'CtsPdfTestCases', '--include-filter', 'CtsPerfettoTestCases', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--include-filter', 'CtsPrintTestCases', '--include-filter', 'CtsProtoTestCases', '--include-filter', 'CtsProviderTestCases', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--include-filter', 'CtsSaxTestCases', '--include-filter', 'CtsSeccompHostTestCases', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
index 8966ee3..ebed8af 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
+        tag='9.0_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSecurityHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
index 94f7625..80456a6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
+        tag='9.0_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsSensorTestCases_-_CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
index 680d277..28b024e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsSensorTestCases_-_CtsSensorTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r16.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
+        tag='9.0_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsSensorTestCases_-_CtsSensorTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
similarity index 95%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
index c44aa89..fd6d47d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
+        tag='9.0_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--include-filter', 'CtsSimRestrictedApisTestCases', '--include-filter', 'CtsSimpleCpuTestCases', '--include-filter', 'CtsSimpleperfTestCases', '--include-filter', 'CtsSkQPTestCases', '--include-filter', 'CtsSliceTestCases', '--include-filter', 'CtsSpeechTestCases', '--include-filter', 'CtsStatsdHostTestCases', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--include-filter', 'CtsTextTestCases', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--include-filter', 'CtsTransitionTestCases', '--include-filter', 'CtsTrustedVoiceHostTestCases', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--include-filter', 'CtsUidIsolationTestCases', '--include-filter', 'CtsUsageStatsTestCases', '--include-filter', 'CtsUsbTests', '--include-filter', 'CtsUtilTestCases', '--include-filter', 'CtsVideoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsViewTestCases_-_CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsViewTestCases_-_CtsViewTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases
index f68ca09..d73abfa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsViewTestCases_-_CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsViewTestCases_-_CtsViewTestCases'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsViewTestCases_-_CtsViewTestCases',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsViewTestCases_-_CtsViewTestCases',
+        tag='9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsViewTestCases_-_CtsViewTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsVmTestCases_-_vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsVmTestCases_-_vm-tests-tf
similarity index 92%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsVmTestCases_-_vm-tests-tf
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsVmTestCases_-_vm-tests-tf
index 9d89f23..858300f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.all.CtsVmTestCases_-_vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsVmTestCases_-_vm-tests-tf
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.all.CtsVmTestCases_-_vm-tests-tf'
+NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsVmTestCases_-_vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r16.x86.all.CtsVmTestCases_-_vm-tests-tf',
-        test_name='cheets_CTS_P.9.0_r16.x86.all.CtsVmTestCases_-_vm-tests-tf',
+        tag='9.0_r17.x86.all.CtsVmTestCases_-_vm-tests-tf',
+        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsVmTestCases_-_vm-tests-tf',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVmTestCases', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--include-filter', 'CtsVrTestCases', '--include-filter', 'CtsWebkitTestCases', '--include-filter', 'CtsWidgetTestCases', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--include-filter', 'cts-system-all.api', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--include-filter', 'vm-tests-tf', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsVmTestCases_-_vm-tests-tf',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.cts-system-all.api
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.cts-system-all.api
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.cts-system-all.api
index b50cd3a..6ee2d18 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.cts-system-all.api
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.cts-system-all.api'
+NAME = 'cheets_CTS_P.9.0_r17.x86.cts-system-all.api'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.cts-system-all.api',
-        test_name='cheets_CTS_P.9.0_r16.x86.cts-system-all.api',
+        tag='9.0_r17.x86.cts-system-all.api',
+        test_name='cheets_CTS_P.9.0_r17.x86.cts-system-all.api',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='cts-system-all.api',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.signed-CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.signed-CtsSecureElementAccessControl
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.signed-CtsSecureElementAccessControl
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.signed-CtsSecureElementAccessControl
index 71e0aa1..621974d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.signed-CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.signed-CtsSecureElementAccessControl
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.signed-CtsSecureElementAccessControl'
+NAME = 'cheets_CTS_P.9.0_r17.x86.signed-CtsSecureElementAccessControl'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.signed-CtsSecureElementAccessControl',
-        test_name='cheets_CTS_P.9.0_r16.x86.signed-CtsSecureElementAccessControl',
+        tag='9.0_r17.x86.signed-CtsSecureElementAccessControl',
+        test_name='cheets_CTS_P.9.0_r17.x86.signed-CtsSecureElementAccessControl',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='signed-CtsSecureElementAccessControl',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.tradefed-run-collect-tests-only-internal
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.tradefed-run-collect-tests-only-internal
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.tradefed-run-collect-tests-only-internal
index 6ff6835..b3f5a59 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.tradefed-run-collect-tests-only-internal
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_CTS_P.9.0_r17.x86.tradefed-run-collect-tests-only-internal'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -21,8 +21,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=0,
-        tag='9.0_r16.x86.tradefed-run-collect-tests-only-internal',
-        test_name='cheets_CTS_P.9.0_r16.x86.tradefed-run-collect-tests-only-internal',
+        tag='9.0_r17.x86.tradefed-run-collect-tests-only-internal',
+        test_name='cheets_CTS_P.9.0_r17.x86.tradefed-run-collect-tests-only-internal',
         run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'CtsMediaTestCases:skip-media-download:true', '--module-arg', 'CtsMediaStressTestCases:skip-media-download:true', '--module-arg', 'CtsMediaBitstreamsTestCases:skip-media-download:true', '--dynamic-config-url='],
         retry_template=None,
         target_module=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.vm-tests-tf
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.vm-tests-tf
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.vm-tests-tf
index 9c288b4..b331b7f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.vm-tests-tf
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.vm-tests-tf'
+NAME = 'cheets_CTS_P.9.0_r17.x86.vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.vm-tests-tf',
-        test_name='cheets_CTS_P.9.0_r16.x86.vm-tests-tf',
+        tag='9.0_r17.x86.vm-tests-tf',
+        test_name='cheets_CTS_P.9.0_r17.x86.vm-tests-tf',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'vm-tests-tf', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='vm-tests-tf',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.wm-presubmit b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.wm-presubmit
similarity index 92%
rename from server/site_tests/cheets_CTS_P/control.9.0_r16.x86.wm-presubmit
rename to server/site_tests/cheets_CTS_P/control.9.0_r17.x86.wm-presubmit
index b0a500d..c1e1348 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r16.x86.wm-presubmit
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.wm-presubmit
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r16.x86.wm-presubmit'
+NAME = 'cheets_CTS_P.9.0_r17.x86.wm-presubmit'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,8 +20,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r16.x86.wm-presubmit',
-        test_name='cheets_CTS_P.9.0_r16.x86.wm-presubmit',
+        tag='9.0_r17.x86.wm-presubmit',
+        test_name='cheets_CTS_P.9.0_r17.x86.wm-presubmit',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--include-filter', 'CtsAppTestCases android.app.cts.TaskDescriptionTest', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--test-arg', 'com.android.compatibility.common.tradefed.testtype.JarHostTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.AndroidJUnitTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.HostTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.AndroidJUnitTest:exclude-annotation:androidx.test.filters.FlakyTest', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='wm-presubmit',