diff --git a/server/site_tests/cheets_CTS_Instant/cheets_CTS_Instant.py b/server/site_tests/cheets_CTS_Instant/cheets_CTS_Instant.py
index 51aff87..eb5d71b 100644
--- a/server/site_tests/cheets_CTS_Instant/cheets_CTS_Instant.py
+++ b/server/site_tests/cheets_CTS_Instant/cheets_CTS_Instant.py
@@ -24,24 +24,22 @@
 # Maximum default time allowed for each individual CTS module.
 _CTS_TIMEOUT_SECONDS = 3600
 
-# Public download locations for android cts bundles.
 _PUBLIC_CTS = 'https://dl.google.com/dl/android/cts/'
-_PARTNER_CTS = 'gs://chromeos-partner-cts/'
-_CTS_URI = {
-        'arm': _PUBLIC_CTS + 'android-cts_instant-9.0_r17-linux_x86-arm.zip',
-        'x86': _PUBLIC_CTS + 'android-cts_instant-9.0_r17-linux_x86-x86.zip',
+_INTERNAL_CTS = 'gs://chromeos-arc-images/cts/bundle/P/'
+_BUNDLE_MAP = {
+        (None, 'arm'):
+        _PUBLIC_CTS + 'android-cts_instant-9.0_r17-linux_x86-arm.zip',
+        (None, 'x86'):
+        _PUBLIC_CTS + 'android-cts_instant-9.0_r17-linux_x86-x86.zip',
+        ('LATEST', 'arm'):
+        _INTERNAL_CTS + 'android-cts_instant-9.0_r17-linux_x86-arm.zip',
+        ('LATEST', 'x86'):
+        _INTERNAL_CTS + 'android-cts_instant-9.0_r17-linux_x86-x86.zip',
+        # No 'DEV' job for CTS_Instant for now.
 }
 _CTS_MEDIA_URI = _PUBLIC_CTS + 'android-cts-media-1.5.zip'
 _CTS_MEDIA_LOCALPATH = '/tmp/android-cts-media'
 
-# Internal uprev for all CTS modules.
-_INTERNAL_CTS = 'gs://chromeos-arc-images/cts/bundle/P/'
-_CTS_LATEST_URI = {
-        'arm': _INTERNAL_CTS + 'android-cts_instant-9.0_r17-linux_x86-arm.zip',
-        'x86': _INTERNAL_CTS + 'android-cts_instant-9.0_r17-linux_x86-x86.zip',
-}
-
-
 class cheets_CTS_Instant(tradefed_test.TradefedTest):
     """Sets up tradefed to run CTS tests."""
     version = 1
@@ -87,11 +85,11 @@
         cmd.append('--quiet-output=true')
         return cmd
 
-    def _get_default_bundle_url(self, bundle):
-        return _CTS_URI[bundle]
-
-    def _get_latest_bundle_url(self, bundle):
-        return _CTS_LATEST_URI[bundle]
+    def _get_bundle_url(self, uri, bundle):
+        if uri and (uri.startswith('http') or uri.startswith('gs')):
+            return uri
+        else:
+            return _BUNDLE_MAP[(uri, bundle)]
 
     def _get_tradefed_base_dir(self):
         return 'android-cts_instant'
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.internal.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
similarity index 90%
rename from server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
rename to server/site_tests/cheets_CTS_Instant/control.internal.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
index 944ae01..be32963 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.internal.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_Instant.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases'
+NAME = 'cheets_CTS_Instant.internal.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_cpu_arm'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases',
-        test_name='cheets_CTS_Instant.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases',
+        tag='internal.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases',
+        test_name='cheets_CTS_Instant.internal.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases',
         run_template=['run', 'commandAndExit', 'cts-instant', '--exclude-filter', 'CtsBackgroundRestrictionsTestCases', '--exclude-filter', 'CtsCameraTestCases', '--exclude-filter', 'CtsColorModeTestCases', '--exclude-filter', 'CtsDatabaseTestCases', '--exclude-filter', 'CtsDisplayTestCases', '--exclude-filter', 'CtsDpiTestCases', '--exclude-filter', 'CtsDreamsTestCases', '--exclude-filter', 'CtsEdiHostTestCases', '--exclude-filter', 'CtsExternalSourcesTestCases', '--exclude-filter', 'CtsFileSystemTestCases', '--exclude-filter', 'CtsFragmentTestCases', '--exclude-filter', 'CtsFragmentTestCasesSdk26', '--exclude-filter', 'CtsGestureTestCases', '--exclude-filter', 'CtsHostsideWebViewTests', '--exclude-filter', 'CtsInputMethodServiceHostTestCases', '--exclude-filter', 'CtsInputMethodTestCases', '--exclude-filter', 'CtsLocation2TestCases', '--exclude-filter', 'CtsLocationTestCases', '--exclude-filter', 'CtsMediaHostTestCases', '--exclude-filter', 'CtsMediaTestCases', '--exclude-filter', 'CtsMultiUserTestCases', '--exclude-filter', 'CtsOsHostTestCases', '--exclude-filter', 'CtsPdfTestCases', '--exclude-filter', 'CtsPermission2TestCases', '--exclude-filter', 'CtsPermissionTestCases', '--exclude-filter', 'CtsPreference2TestCases', '--exclude-filter', 'CtsPreferenceTestCases', '--exclude-filter', 'CtsPrintTestCases', '--exclude-filter', 'CtsSampleDeviceTestCases', '--exclude-filter', 'CtsSampleHostTestCases', '--exclude-filter', 'CtsSystemUiTestCases', '--exclude-filter', 'CtsTextTestCases', '--exclude-filter', 'CtsToastTestCases', '--exclude-filter', 'CtsUiAutomationTestCases', '--exclude-filter', 'CtsUiDeviceTestCases', '--exclude-filter', 'CtsUidIsolationTestCases', '--exclude-filter', 'CtsUsageStatsTestCases', '--exclude-filter', 'CtsUsbTests', '--exclude-filter', 'CtsViewTestCases', '--exclude-filter', 'CtsWidgetTestCases', '--exclude-filter', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases',
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases b/server/site_tests/cheets_CTS_Instant/control.internal.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
similarity index 89%
rename from server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
rename to server/site_tests/cheets_CTS_Instant/control.internal.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
index e601d09..7075133 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.internal.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_Instant.9.0_r17.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases'
+NAME = 'cheets_CTS_Instant.internal.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_cpu_arm'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases',
-        test_name='cheets_CTS_Instant.9.0_r17.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases',
+        tag='internal.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases',
+        test_name='cheets_CTS_Instant.internal.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases',
         run_template=['run', 'commandAndExit', 'cts-instant', '--exclude-filter', 'CtsAccessibilityServiceTestCases', '--exclude-filter', 'CtsAccessibilityTestCases', '--exclude-filter', 'CtsAccountManagerTestCases', '--exclude-filter', 'CtsAnimationTestCases', '--exclude-filter', 'CtsAppSecurityHostTestCases', '--exclude-filter', 'CtsAppWidgetTestCases', '--exclude-filter', 'CtsAutoFillServiceTestCases', '--exclude-filter', 'CtsSampleDeviceTestCases', '--exclude-filter', 'CtsSampleHostTestCases', '--exclude-filter', 'CtsSystemUiTestCases', '--exclude-filter', 'CtsTextTestCases', '--exclude-filter', 'CtsToastTestCases', '--exclude-filter', 'CtsUiAutomationTestCases', '--exclude-filter', 'CtsUiDeviceTestCases', '--exclude-filter', 'CtsUidIsolationTestCases', '--exclude-filter', 'CtsUsageStatsTestCases', '--exclude-filter', 'CtsUsbTests', '--exclude-filter', 'CtsViewTestCases', '--exclude-filter', 'CtsWidgetTestCases', '--exclude-filter', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases',
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.internal.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
similarity index 90%
rename from server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
rename to server/site_tests/cheets_CTS_Instant/control.internal.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
index 5483be9..e7513b8 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.internal.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_Instant.9.0_r17.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases'
+NAME = 'cheets_CTS_Instant.internal.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_cpu_arm'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases',
-        test_name='cheets_CTS_Instant.9.0_r17.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases',
+        tag='internal.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases',
+        test_name='cheets_CTS_Instant.internal.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts-instant', '--exclude-filter', 'CtsAccessibilityServiceTestCases', '--exclude-filter', 'CtsAccessibilityTestCases', '--exclude-filter', 'CtsAccountManagerTestCases', '--exclude-filter', 'CtsAnimationTestCases', '--exclude-filter', 'CtsAppSecurityHostTestCases', '--exclude-filter', 'CtsAppWidgetTestCases', '--exclude-filter', 'CtsAutoFillServiceTestCases', '--exclude-filter', 'CtsBackgroundRestrictionsTestCases', '--exclude-filter', 'CtsCameraTestCases', '--exclude-filter', 'CtsColorModeTestCases', '--exclude-filter', 'CtsDatabaseTestCases', '--exclude-filter', 'CtsDisplayTestCases', '--exclude-filter', 'CtsDpiTestCases', '--exclude-filter', 'CtsDreamsTestCases', '--exclude-filter', 'CtsEdiHostTestCases', '--exclude-filter', 'CtsExternalSourcesTestCases', '--exclude-filter', 'CtsFileSystemTestCases', '--exclude-filter', 'CtsFragmentTestCases', '--exclude-filter', 'CtsFragmentTestCasesSdk26', '--exclude-filter', 'CtsGestureTestCases', '--exclude-filter', 'CtsHostsideWebViewTests', '--exclude-filter', 'CtsInputMethodServiceHostTestCases', '--exclude-filter', 'CtsInputMethodTestCases', '--exclude-filter', 'CtsLocation2TestCases', '--exclude-filter', 'CtsLocationTestCases', '--exclude-filter', 'CtsMediaHostTestCases', '--exclude-filter', 'CtsMediaTestCases', '--exclude-filter', 'CtsMultiUserTestCases', '--exclude-filter', 'CtsOsHostTestCases', '--exclude-filter', 'CtsPdfTestCases', '--exclude-filter', 'CtsPermission2TestCases', '--exclude-filter', 'CtsPermissionTestCases', '--exclude-filter', 'CtsPreference2TestCases', '--exclude-filter', 'CtsPreferenceTestCases', '--exclude-filter', 'CtsPrintTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases',
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.internal.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
similarity index 90%
rename from server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
rename to server/site_tests/cheets_CTS_Instant/control.internal.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
index 1dbb1ff..8db3221 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.internal.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_Instant.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases'
+NAME = 'cheets_CTS_Instant.internal.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_cpu_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases',
-        test_name='cheets_CTS_Instant.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases',
+        tag='internal.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases',
+        test_name='cheets_CTS_Instant.internal.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases',
         run_template=['run', 'commandAndExit', 'cts-instant', '--exclude-filter', 'CtsBackgroundRestrictionsTestCases', '--exclude-filter', 'CtsCameraTestCases', '--exclude-filter', 'CtsColorModeTestCases', '--exclude-filter', 'CtsDatabaseTestCases', '--exclude-filter', 'CtsDisplayTestCases', '--exclude-filter', 'CtsDpiTestCases', '--exclude-filter', 'CtsDreamsTestCases', '--exclude-filter', 'CtsEdiHostTestCases', '--exclude-filter', 'CtsExternalSourcesTestCases', '--exclude-filter', 'CtsFileSystemTestCases', '--exclude-filter', 'CtsFragmentTestCases', '--exclude-filter', 'CtsFragmentTestCasesSdk26', '--exclude-filter', 'CtsGestureTestCases', '--exclude-filter', 'CtsHostsideWebViewTests', '--exclude-filter', 'CtsInputMethodServiceHostTestCases', '--exclude-filter', 'CtsInputMethodTestCases', '--exclude-filter', 'CtsLocation2TestCases', '--exclude-filter', 'CtsLocationTestCases', '--exclude-filter', 'CtsMediaHostTestCases', '--exclude-filter', 'CtsMediaTestCases', '--exclude-filter', 'CtsMultiUserTestCases', '--exclude-filter', 'CtsOsHostTestCases', '--exclude-filter', 'CtsPdfTestCases', '--exclude-filter', 'CtsPermission2TestCases', '--exclude-filter', 'CtsPermissionTestCases', '--exclude-filter', 'CtsPreference2TestCases', '--exclude-filter', 'CtsPreferenceTestCases', '--exclude-filter', 'CtsPrintTestCases', '--exclude-filter', 'CtsSampleDeviceTestCases', '--exclude-filter', 'CtsSampleHostTestCases', '--exclude-filter', 'CtsSystemUiTestCases', '--exclude-filter', 'CtsTextTestCases', '--exclude-filter', 'CtsToastTestCases', '--exclude-filter', 'CtsUiAutomationTestCases', '--exclude-filter', 'CtsUiDeviceTestCases', '--exclude-filter', 'CtsUidIsolationTestCases', '--exclude-filter', 'CtsUsageStatsTestCases', '--exclude-filter', 'CtsUsbTests', '--exclude-filter', 'CtsViewTestCases', '--exclude-filter', 'CtsWidgetTestCases', '--exclude-filter', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases',
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases b/server/site_tests/cheets_CTS_Instant/control.internal.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
similarity index 89%
rename from server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
rename to server/site_tests/cheets_CTS_Instant/control.internal.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
index 3ec651f..d2fb906 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.internal.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_Instant.9.0_r17.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases'
+NAME = 'cheets_CTS_Instant.internal.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_cpu_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases',
-        test_name='cheets_CTS_Instant.9.0_r17.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases',
+        tag='internal.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases',
+        test_name='cheets_CTS_Instant.internal.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases',
         run_template=['run', 'commandAndExit', 'cts-instant', '--exclude-filter', 'CtsAccessibilityServiceTestCases', '--exclude-filter', 'CtsAccessibilityTestCases', '--exclude-filter', 'CtsAccountManagerTestCases', '--exclude-filter', 'CtsAnimationTestCases', '--exclude-filter', 'CtsAppSecurityHostTestCases', '--exclude-filter', 'CtsAppWidgetTestCases', '--exclude-filter', 'CtsAutoFillServiceTestCases', '--exclude-filter', 'CtsSampleDeviceTestCases', '--exclude-filter', 'CtsSampleHostTestCases', '--exclude-filter', 'CtsSystemUiTestCases', '--exclude-filter', 'CtsTextTestCases', '--exclude-filter', 'CtsToastTestCases', '--exclude-filter', 'CtsUiAutomationTestCases', '--exclude-filter', 'CtsUiDeviceTestCases', '--exclude-filter', 'CtsUidIsolationTestCases', '--exclude-filter', 'CtsUsageStatsTestCases', '--exclude-filter', 'CtsUsbTests', '--exclude-filter', 'CtsViewTestCases', '--exclude-filter', 'CtsWidgetTestCases', '--exclude-filter', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases',
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.internal.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
similarity index 90%
rename from server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
rename to server/site_tests/cheets_CTS_Instant/control.internal.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
index 3fd9006..e565d4c 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.internal.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_Instant.9.0_r17.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases'
+NAME = 'cheets_CTS_Instant.internal.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_cpu_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases',
-        test_name='cheets_CTS_Instant.9.0_r17.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases',
+        tag='internal.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases',
+        test_name='cheets_CTS_Instant.internal.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts-instant', '--exclude-filter', 'CtsAccessibilityServiceTestCases', '--exclude-filter', 'CtsAccessibilityTestCases', '--exclude-filter', 'CtsAccountManagerTestCases', '--exclude-filter', 'CtsAnimationTestCases', '--exclude-filter', 'CtsAppSecurityHostTestCases', '--exclude-filter', 'CtsAppWidgetTestCases', '--exclude-filter', 'CtsAutoFillServiceTestCases', '--exclude-filter', 'CtsBackgroundRestrictionsTestCases', '--exclude-filter', 'CtsCameraTestCases', '--exclude-filter', 'CtsColorModeTestCases', '--exclude-filter', 'CtsDatabaseTestCases', '--exclude-filter', 'CtsDisplayTestCases', '--exclude-filter', 'CtsDpiTestCases', '--exclude-filter', 'CtsDreamsTestCases', '--exclude-filter', 'CtsEdiHostTestCases', '--exclude-filter', 'CtsExternalSourcesTestCases', '--exclude-filter', 'CtsFileSystemTestCases', '--exclude-filter', 'CtsFragmentTestCases', '--exclude-filter', 'CtsFragmentTestCasesSdk26', '--exclude-filter', 'CtsGestureTestCases', '--exclude-filter', 'CtsHostsideWebViewTests', '--exclude-filter', 'CtsInputMethodServiceHostTestCases', '--exclude-filter', 'CtsInputMethodTestCases', '--exclude-filter', 'CtsLocation2TestCases', '--exclude-filter', 'CtsLocationTestCases', '--exclude-filter', 'CtsMediaHostTestCases', '--exclude-filter', 'CtsMediaTestCases', '--exclude-filter', 'CtsMultiUserTestCases', '--exclude-filter', 'CtsOsHostTestCases', '--exclude-filter', 'CtsPdfTestCases', '--exclude-filter', 'CtsPermission2TestCases', '--exclude-filter', 'CtsPermissionTestCases', '--exclude-filter', 'CtsPreference2TestCases', '--exclude-filter', 'CtsPreferenceTestCases', '--exclude-filter', 'CtsPrintTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases',