cheets_CTS_P: Uprev regression tests to the latest DEV build 7915399.

(NOTE: In addition to the main CL, this cherrypick
merges https://chromium-review.googlesource.com/3303336 and
reverts https://chromium-review.googlesource.com/3270090.)

Implements the proposal go/arc-cts-qual-and-latest to run
newer CTS build on regression test jobs (control files
without "all" in their names.)

It also integrates the regeneration of control files
after crrev.com/c/3217159 removed revision numbers.

BUG=b:202272919
TEST=cheets_CTS_P.internal.arm.CtsAbiOverrideHostTestCases
TEST=cheets_CTS_P.arm.CtsAbiOverrideHostTestCases
TEST=cheets_CTS_P.internal.arm.all.
  CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
TEST=./generate_controlfiles.py --is_latest is NO-OP
TEST=./generate_controlfiles.py --is_public is NO-OP

Change-Id: I073d3931ba258b36a2320f7a2e57d5e7117f3f3f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3296242
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Jiyoun Ha <jiyounha@chromium.org>
(cherry picked from commit 972c2ed97d80484e9d78032ba1ab279bdfa60b1b)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3319047
Commit-Queue: Jiyoun Ha <jiyounha@chromium.org>
diff --git a/server/cros/tradefed/generate_controlfiles_common.py b/server/cros/tradefed/generate_controlfiles_common.py
index 15f613d..f4b3c8d 100755
--- a/server/cros/tradefed/generate_controlfiles_common.py
+++ b/server/cros/tradefed/generate_controlfiles_common.py
@@ -9,6 +9,7 @@
 import argparse
 import contextlib
 import copy
+from enum import Enum
 import logging
 import os
 import re
@@ -21,6 +22,13 @@
 # Use 'sudo pip install jinja2' to install.
 from jinja2 import Template
 
+# Type of source storage from where the generated control files should
+# retrieve the xTS bundle zip file.
+#  'MOBLAB' means the bucket for moblab used by 3PL.
+#  'LATEST' means the latest official xTS release.
+#  'DEV' means the preview version build from development branch.
+SourceType = Enum('SourceType', ['MOBLAB', 'LATEST', 'DEV'])
+
 
 # TODO(ihf): Assign better TIME to control files. Scheduling uses this to run
 # LENGTHY first, then LONG, MEDIUM etc. But we need LENGTHY for the collect
@@ -753,8 +761,8 @@
     return get_run_template(modules, is_public, retry=True)
 
 
-def get_extra_modules_dict(is_public, abi):
-    if not is_public:
+def get_extra_modules_dict(source_type, abi):
+    if source_type != SourceType.MOBLAB:
         return CONFIG['EXTRA_MODULES']
 
     extra_modules = copy.deepcopy(CONFIG['PUBLIC_EXTRA_MODULES'])
@@ -862,8 +870,7 @@
                             build,
                             uri,
                             suites=None,
-                            is_public=False,
-                            is_latest=False,
+                            source_type=None,
                             abi_bits=None,
                             led_provision=None,
                             camera_facing=None,
@@ -876,6 +883,7 @@
                    file. If 'all' is specified, the control file will run
                    all the tests.
     """
+    is_public = (source_type == SourceType.MOBLAB)
     # We tag results with full revision now to get result directories containing
     # the revision. This fits stainless/ better.
     tag = '%s' % get_extension(combined, abi, revision, is_public,
@@ -887,11 +895,15 @@
     if not suites:
         suites = get_suites(modules, abi, is_public, camera_facing, hardware_suite)
     attributes = ', '.join(suites)
-    uri = 'LATEST' if is_latest else (None if is_public else uri)
+    uri = {
+            SourceType.MOBLAB: None,
+            SourceType.LATEST: 'LATEST',
+            SourceType.DEV: 'DEV'
+    }.get(source_type)
     target_module = None
     if (combined not in get_collect_modules(is_public) and combined != _ALL):
         target_module = combined
-    for target, config in get_extra_modules_dict(is_public, abi).items():
+    for target, config in get_extra_modules_dict(source_type, abi).items():
         if combined in config.keys():
             target_module = target
     abi_to_run = {
@@ -1168,12 +1180,12 @@
                       build,
                       uri,
                       suites,
-                      is_public,
-                      is_latest=False,
+                      source_type,
                       whole_module_set=None,
                       hardware_suite=False,
                       abi_bits=None):
     """Write control files per each ABI or combined."""
+    is_public = (source_type == SourceType.MOBLAB)
     abi_bits_list = []
     config_key = 'PUBLIC_SPLIT_BY_BITS_MODULES' if is_public else 'SPLIT_BY_BITS_MODULES'
     if modules & set(CONFIG.get(config_key, [])):
@@ -1198,8 +1210,7 @@
                                           build,
                                           uri,
                                           suites,
-                                          is_public,
-                                          is_latest,
+                                          source_type,
                                           hardware_suite=hardware_suite,
                                           whole_module_set=whole_module_set,
                                           abi_bits=abi_bits)
@@ -1207,7 +1218,7 @@
             f.write(content)
 
 
-def write_moblab_controlfiles(modules, abi, revision, build, uri, is_public):
+def write_moblab_controlfiles(modules, abi, revision, build, uri):
     """Write all control files for moblab.
 
     Nothing gets combined.
@@ -1221,12 +1232,18 @@
         # option will cover variants with optional parameters.
         if is_parameterized_module(module):
             continue
-        write_controlfile(module, set([module]), abi, revision, build, uri,
-                          None, is_public)
+        write_controlfile(module,
+                          set([module]),
+                          abi,
+                          revision,
+                          build,
+                          uri,
+                          None,
+                          source_type=SourceType.MOBLAB)
 
 
 def write_regression_controlfiles(modules, abi, revision, build, uri,
-                                  is_public, is_latest):
+                                  source_type):
     """Write all control files for stainless/ToT regression lab coverage.
 
     Regression coverage on tot currently relies heavily on watching stainless
@@ -1245,18 +1262,17 @@
                           build,
                           uri,
                           None,
-                          is_public,
-                          is_latest,
+                          source_type,
                           whole_module_set=module_set)
     else:
         combined = combine_modules_by_common_word(set(modules))
         for key in combined:
             write_controlfile(key, combined[key], abi, revision, build, uri,
-                              None, is_public, is_latest)
+                              None, source_type)
 
 
 def write_qualification_controlfiles(modules, abi, revision, build, uri,
-                                     is_public, is_latest):
+                                     source_type):
     """Write all control files to run "all" tests for qualification.
 
     Qualification was performed on N by running all tests using tradefed
@@ -1278,19 +1294,16 @@
                                       build,
                                       uri,
                                       CONFIG.get('QUAL_SUITE_NAMES'),
-                                      is_public,
-                                      is_latest,
+                                      source_type,
                                       abi_bits=abi_bits)
         else:
             write_controlfile('all.' + key, combined[key], abi,
                               revision, build, uri,
-                              CONFIG.get('QUAL_SUITE_NAMES'), is_public,
-                              is_latest)
+                              CONFIG.get('QUAL_SUITE_NAMES'), source_type)
 
 
 def write_qualification_and_regression_controlfile(modules, abi, revision,
-                                                   build, uri, is_public,
-                                                   is_latest):
+                                                   build, uri, source_type):
     """Write a control file to run "all" tests for qualification and regression.
     """
     # For cts-instant, qualication control files are expected to cover
@@ -1306,17 +1319,22 @@
                           build,
                           uri,
                           suites,
-                          is_public,
-                          is_latest,
+                          source_type,
                           whole_module_set=module_set)
 
 
-def write_collect_controlfiles(_modules, abi, revision, build, uri, is_public,
-                               is_latest, is_hardware=False):
+def write_collect_controlfiles(_modules,
+                               abi,
+                               revision,
+                               build,
+                               uri,
+                               source_type,
+                               is_hardware=False):
     """Write all control files for test collection used as reference to
 
     compute completeness (missing tests) on the CTS dashboard.
     """
+    is_public = (source_type == SourceType.MOBLAB)
     if is_public:
         if is_hardware:
             suites = [CONFIG['MOBLAB_HARDWARE_SUITE_NAME']]
@@ -1336,36 +1354,40 @@
                           build,
                           uri,
                           suites,
-                          is_public,
-                          is_latest,
+                          source_type,
                           hardware_suite=is_hardware)
 
 
-def write_extra_controlfiles(_modules, abi, revision, build, uri, is_public,
-                             is_latest):
+def write_extra_controlfiles(_modules, abi, revision, build, uri, source_type):
     """Write all extra control files as specified in config.
 
     This is used by moblab to load balance large modules like Deqp, as well as
     making custom modules such as WM presubmit. A similar approach was also used
     during bringup of grunt to split media tests.
     """
-    for module, config in get_extra_modules_dict(is_public, abi).items():
+    for module, config in get_extra_modules_dict(source_type, abi).items():
         for submodule, suites in config.items():
             write_controlfile(submodule, set([submodule]), abi, revision,
-                              build, uri, suites, is_public,
-                              is_latest)
+                              build, uri, suites, source_type)
 
-def write_hardwaresuite_controlfiles(abi, revision, build, uri, is_public,
-                                     is_latest):
+
+def write_hardwaresuite_controlfiles(abi, revision, build, uri, source_type):
     """Control files for Build variant hardware only tests."""
+    is_public = (source_type == SourceType.MOBLAB)
     cts_hardware_modules = set(CONFIG.get('HARDWARE_MODULES', []))
     for module in cts_hardware_modules:
         name = get_controlfile_name(module, abi, revision, is_public,
                                     hardware_suite=True)
 
-        content = get_controlfile_content(module, set([module]), abi, revision,
-                                    build, uri, None, is_public, is_latest,
-                                    hardware_suite=True)
+        content = get_controlfile_content(module,
+                                          set([module]),
+                                          abi,
+                                          revision,
+                                          build,
+                                          uri,
+                                          None,
+                                          source_type,
+                                          hardware_suite=True)
 
         with open(name, 'w') as f:
             f.write(content)
@@ -1381,17 +1403,16 @@
                                               build,
                                               uri,
                                               None,
-                                              is_public,
-                                              is_latest,
+                                              source_type,
                                               hardware_suite=True)
             with open(name, 'w') as f:
                 f.write(content)
 
 
-def write_extra_camera_controlfiles(abi, revision, build, uri, is_public,
-                                    is_latest):
+def write_extra_camera_controlfiles(abi, revision, build, uri, source_type):
     """Control files for CtsCameraTestCases.camerabox.*"""
     module = 'CtsCameraTestCases'
+    is_public = (source_type == SourceType.MOBLAB)
     for facing in ['back', 'front']:
         led_provision = 'noled'
         name = get_controlfile_name(module, abi, revision, is_public,
@@ -1403,21 +1424,21 @@
                                           build,
                                           uri,
                                           None,
-                                          is_public,
-                                          is_latest,
+                                          source_type,
                                           led_provision=led_provision,
                                           camera_facing=facing)
         with open(name, 'w') as f:
             f.write(content)
 
 
-def run(uris, is_public, is_latest, cache_dir):
+def run(uris, source_type, cache_dir):
     """Downloads each bundle in |uris| and generates control files for each
 
     module as reported to us by tradefed.
     """
     for uri in uris:
         abi = get_bundle_abi(uri)
+        is_public = (source_type == SourceType.MOBLAB)
         # Get tradefed data by downloading & unzipping the files
         with TemporaryDirectory(prefix='cts-android_') as tmp:
             if cache_dir is not None:
@@ -1437,46 +1458,63 @@
                 raise Exception('Could not determine revision.')
 
             logging.info('Writing all control files.')
-            if is_public:
-                write_moblab_controlfiles(modules, abi, revision, build, uri,
-                                          is_public)
-            else:
-                if CONFIG['CONTROLFILE_WRITE_SIMPLE_QUAL_AND_REGRESS']:
-                    write_qualification_and_regression_controlfile(
-                            modules, abi, revision, build, uri, is_public,
-                            is_latest)
-                else:
-                    write_regression_controlfiles(modules, abi, revision,
-                                                  build, uri, is_public,
-                                                  is_latest)
-                    write_qualification_controlfiles(modules, abi, revision,
-                                                     build, uri, is_public,
-                                                     is_latest)
+            if source_type == SourceType.MOBLAB:
+                write_moblab_controlfiles(modules, abi, revision, build, uri)
 
-                if CONFIG['CONTROLFILE_WRITE_CAMERA']:
+            if CONFIG['CONTROLFILE_WRITE_SIMPLE_QUAL_AND_REGRESS']:
+                # Might be worth generating DEV control files, but since this
+                # is used for only ARC-P CTS_Instant modules whose regression
+                # is 99.99% coverved by CTS DEV runs, having only LATEST is
+                # sufficient.
+                if source_type == SourceType.LATEST:
+                    write_qualification_and_regression_controlfile(
+                            modules, abi, revision, build, uri, source_type)
+            else:
+                if source_type == SourceType.DEV:
+                    write_regression_controlfiles(modules, abi, revision,
+                                                  build, uri, source_type)
+                if source_type == SourceType.LATEST:
+                    write_qualification_controlfiles(modules, abi, revision,
+                                                     build, uri, source_type)
+
+            if CONFIG['CONTROLFILE_WRITE_CAMERA']:
+                # For now camerabox is not stable for qualification purpose.
+                # Hence, the usage is limited to DEV. In the future we need
+                # to reconsider.
+                if source_type == SourceType.DEV:
                     write_extra_camera_controlfiles(abi, revision, build, uri,
-                                                    is_public, is_latest)
+                                                    source_type)
 
             if CONFIG.get('CONTROLFILE_WRITE_COLLECT', True):
-                write_collect_controlfiles(modules, abi, revision, build, uri,
-                                           is_public, is_latest,
-                                           is_hardware=False)
-                if 'HARDWARE_MODULES' in CONFIG:
-                    write_collect_controlfiles(modules,
-                                               abi,
-                                               revision,
-                                               build,
-                                               uri,
-                                               is_public,
-                                               is_latest,
-                                               is_hardware=True)
+                # Collect-test control files are used for checking the test
+                # completeness before qualification. Not needed for DEV.
+                if source_type == SourceType.LATEST or source_type == SourceType.MOBLAB:
+                    for_hardware_suite = [False]
+                    if 'HARDWARE_MODULES' in CONFIG:
+                        for_hardware_suite.append(True)
+                    for is_hardware in for_hardware_suite:
+                        write_collect_controlfiles(modules,
+                                                   abi,
+                                                   revision,
+                                                   build,
+                                                   uri,
+                                                   source_type,
+                                                   is_hardware=is_hardware)
 
             if CONFIG['CONTROLFILE_WRITE_EXTRA']:
-                write_extra_controlfiles(None, abi, revision, build, uri,
-                                         is_public, is_latest)
+                # "EXTRA" control files are for workaround test instability
+                # by running only sub-tests. For now let's attribute them to
+                # qualification suites, since it is sometimes critical to
+                # have the stability for qualification. If needed we need to
+                # implement some way to add them to DEV suites as well.
+                if source_type == SourceType.LATEST or source_type == SourceType.MOBLAB:
+                    write_extra_controlfiles(None, abi, revision, build, uri,
+                                             source_type)
 
-            write_hardwaresuite_controlfiles(abi, revision, build, uri,
-                                             is_public, is_latest)
+            # "Hardware only" jobs are for reducing tests on qualification.
+            if source_type == SourceType.LATEST or source_type == SourceType.MOBLAB:
+                write_hardwaresuite_controlfiles(abi, revision, build, uri,
+                                                 source_type)
 
 
 def main(config):
@@ -1518,4 +1556,10 @@
             'bundle file if exists, or caches a downloaded file to this '
             'directory if not.')
     args = parser.parse_args()
-    run(args.uris, args.is_public, args.is_latest, args.cache_dir)
+    if args.is_public:
+        source_type = SourceType.MOBLAB
+    elif args.is_latest:
+        source_type = SourceType.LATEST
+    else:
+        source_type = SourceType.DEV
+    run(args.uris, source_type, args.cache_dir)
diff --git a/server/cros/tradefed/tradefed_test.py b/server/cros/tradefed/tradefed_test.py
index 59cdbff..cba943c 100644
--- a/server/cros/tradefed/tradefed_test.py
+++ b/server/cros/tradefed/tradefed_test.py
@@ -161,8 +161,7 @@
 
         # Install the tradefed bundle.
         bundle_install_path = self._install_bundle(
-                self._get_latest_bundle_url(bundle) if uri == 'LATEST' else (
-                        uri or self._get_default_bundle_url(bundle)))
+                self._get_bundle_url(uri, bundle))
         self._repository = os.path.join(bundle_install_path,
                                         self._get_tradefed_base_dir())
 
@@ -1236,6 +1235,11 @@
             lastmatch = (session, passed, failed, done == total)
         return lastmatch
 
+    def _get_bundle_url(self, uri, bundle):
+        # TODO: Replace with NotImplementedError once all subclasses are done
+        return self._get_latest_bundle_url(bundle) if uri == 'LATEST' else (
+                uri or self._get_default_bundle_url(bundle))
+
     def _tradefed_retry_command(self, template, session_id):
         raise NotImplementedError('Subclass should override this function')
 
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 eb724db..c73274f 100644
--- a/server/site_tests/cheets_CTS_P/cheets_CTS_P.py
+++ b/server/site_tests/cheets_CTS_P/cheets_CTS_P.py
@@ -27,23 +27,23 @@
 # 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-9.0_r17-linux_x86-arm.zip',
-        'x86': _PUBLIC_CTS + 'android-cts-9.0_r17-linux_x86-x86.zip',
+_INTERNAL_CTS = 'gs://chromeos-arc-images/cts/bundle/P/'
+_BUNDLE_MAP = {
+        (None, 'arm'): _PUBLIC_CTS + 'android-cts-9.0_r17-linux_x86-arm.zip',
+        (None, 'x86'): _PUBLIC_CTS + 'android-cts-9.0_r17-linux_x86-x86.zip',
+        ('LATEST', 'arm'):
+        _INTERNAL_CTS + 'android-cts-9.0_r17-linux_x86-arm.zip',
+        ('LATEST', 'x86'):
+        _INTERNAL_CTS + 'android-cts-9.0_r17-linux_x86-x86.zip',
+        ('DEV', 'arm'):
+        _INTERNAL_CTS + 'android-cts-7915399-linux_x86-arm.zip',
+        ('DEV', 'x86'):
+        _INTERNAL_CTS + 'android-cts-7915399-linux_x86-x86.zip',
 }
 _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-9.0_r17-linux_x86-arm.zip',
-        'x86': _INTERNAL_CTS + 'android-cts-9.0_r17-linux_x86-x86.zip',
-}
-
 
 class cheets_CTS_P(tradefed_test.TradefedTest):
     """Sets up tradefed to run CTS tests."""
@@ -84,11 +84,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'
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAbiOverrideHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAbiOverrideHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsAbiOverrideHostTestCases
index d5bc368..51e9219 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAbiOverrideHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAbiOverrideHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsAbiOverrideHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsAbiOverrideHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsAbiOverrideHostTestCases',
+        tag='internal.arm.CtsAbiOverrideHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAccelerationTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccelerationTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsAccelerationTestCases
index 042dc51..181cd11 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAccelerationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAccelerationTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsAccelerationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-arc'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r17.arm.CtsAccelerationTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsAccelerationTestCases',
+        tag='internal.arm.CtsAccelerationTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccessibility b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAccessibility
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccessibility
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsAccessibility
index a427b3b..86d04e5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAccessibility
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAccessibility'
+NAME = 'cheets_CTS_P.internal.arm.CtsAccessibility'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsAccessibility',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsAccessibility',
+        tag='internal.arm.CtsAccessibility',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAccountManagerTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsAccountManagerTestCases
index dce4baf..1719996 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAccountManagerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r17.arm.CtsAccountManagerTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsAccountManagerTestCases',
+        tag='internal.arm.CtsAccountManagerTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsActivityManagerDevice
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsActivityManagerDevice
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsActivityManagerDevice
index e93570b..02ceefb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsActivityManagerDevice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsActivityManagerDevice'
+NAME = 'cheets_CTS_P.internal.arm.CtsActivityManagerDevice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsActivityManagerDevice',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsActivityManagerDevice',
+        tag='internal.arm.CtsActivityManagerDevice',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAdmin b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAdmin
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAdmin
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsAdmin
index e4940b8..30ba700 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAdmin
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAdmin
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAdmin'
+NAME = 'cheets_CTS_P.internal.arm.CtsAdmin'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsAdmin',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsAdmin',
+        tag='internal.arm.CtsAdmin',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAlarm b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAlarm
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAlarm
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsAlarm
index 38fc0bb..3036359 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAlarm
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAlarm
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAlarm'
+NAME = 'cheets_CTS_P.internal.arm.CtsAlarm'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsAlarm',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsAlarm',
+        tag='internal.arm.CtsAlarm',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAndroid b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAndroid
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAndroid
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsAndroid
index 6273f13..f8ec8f9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAndroid
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAndroid
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAndroid'
+NAME = 'cheets_CTS_P.internal.arm.CtsAndroid'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsAndroid',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsAndroid',
+        tag='internal.arm.CtsAndroid',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAnimationTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAnimationTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsAnimationTestCases
index c554c38..3da859d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAnimationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAnimationTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsAnimationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsAnimationTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsAnimationTestCases',
+        tag='internal.arm.CtsAnimationTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApacheHttpLegacy b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsApacheHttpLegacy
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApacheHttpLegacy
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsApacheHttpLegacy
index a2c62ae..3759c18 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApacheHttpLegacy
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsApacheHttpLegacy
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsApacheHttpLegacy'
+NAME = 'cheets_CTS_P.internal.arm.CtsApacheHttpLegacy'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsApacheHttpLegacy',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsApacheHttpLegacy',
+        tag='internal.arm.CtsApacheHttpLegacy',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApp b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsApp
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApp
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsApp
index 27f09bb..76ef5c3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApp
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsApp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsApp'
+NAME = 'cheets_CTS_P.internal.arm.CtsApp'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         enable_default_apps=True,
-        tag='9.0_r17.arm.CtsApp',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsApp',
+        tag='internal.arm.CtsApp',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=23400)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAppTestCases.feature.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAppTestCases.feature.ctshardware
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAppTestCases.feature.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsAppTestCases.feature.ctshardware
index b4df2f5..fdf63ee 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAppTestCases.feature.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAppTestCases.feature.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAppTestCases.feature.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsAppTestCases.feature.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsAppTestCases.feature.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsAppTestCases.feature.ctshardware',
+        tag='internal.arm.CtsAppTestCases.feature.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsAppTestCases.feature.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppTestCases android.app.cts.SystemFeaturesTest', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAppTestCases.feature',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAslrMallocTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAslrMallocTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsAslrMallocTestCases
index 6ce8761..134e769 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAslrMallocTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAslrMallocTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsAslrMallocTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsAslrMallocTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsAslrMallocTestCases',
+        tag='internal.arm.CtsAslrMallocTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAssistTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAssistTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsAssistTestCases
index 137e68f..a144df3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAssistTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAssistTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsAssistTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsAssistTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsAssistTestCases',
+        tag='internal.arm.CtsAssistTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAtraceHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAtraceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsAtraceHostTestCases
index cac524c..62ffc01 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAtraceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAtraceHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsAtraceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsAtraceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsAtraceHostTestCases',
+        tag='internal.arm.CtsAtraceHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAutoFillServiceTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAutoFillServiceTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsAutoFillServiceTestCases
index 724933f..8715507 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsAutoFillServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsAutoFillServiceTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsAutoFillServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsAutoFillServiceTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsAutoFillServiceTestCases',
+        tag='internal.arm.CtsAutoFillServiceTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=21600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsBackgroundRestrictionsTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackgroundRestrictionsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsBackgroundRestrictionsTestCases
index 5126cc4..e9ee352 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsBackgroundRestrictionsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsBackgroundRestrictionsTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsBackgroundRestrictionsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsBackgroundRestrictionsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsBackgroundRestrictionsTestCases',
+        tag='internal.arm.CtsBackgroundRestrictionsTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackup b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsBackup
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackup
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsBackup
index 5a38b18..cf57169 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackup
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsBackup
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsBackup'
+NAME = 'cheets_CTS_P.internal.arm.CtsBackup'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsBackup',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsBackup',
+        tag='internal.arm.CtsBackup',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsBatterySavingTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBatterySavingTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsBatterySavingTestCases
index 8a4f567..d66015b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsBatterySavingTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsBatterySavingTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsBatterySavingTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsBatterySavingTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsBatterySavingTestCases',
+        tag='internal.arm.CtsBatterySavingTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsBionicTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBionicTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsBionicTestCases
index 6ece3e6..3834808 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsBionicTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsBionicTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsBionicTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsBionicTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsBionicTestCases',
+        tag='internal.arm.CtsBionicTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsBluetoothTestCases
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBluetoothTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsBluetoothTestCases
index b80a897..06a59a5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsBluetoothTestCases
@@ -7,7 +7,7 @@
 from autotest_lib.server import utils
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsBluetoothTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsBluetoothTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -34,14 +34,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsBluetoothTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsBluetoothTestCases',
+        tag='internal.arm.CtsBluetoothTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         prerequisites=['bluetooth'],
         hard_reboot_on_failure=True,
         timeout=3600)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsBootStatsTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBootStatsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsBootStatsTestCases
index 0327155..ecfbeb8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsBootStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsBootStatsTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsBootStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsBootStatsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsBootStatsTestCases',
+        tag='internal.arm.CtsBootStatsTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCalendarcommon2TestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCalendarcommon2TestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsCalendarcommon2TestCases
index 744530e..55958fd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCalendarcommon2TestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCalendarcommon2TestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsCalendarcommon2TestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsCalendarcommon2TestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsCalendarcommon2TestCases',
+        tag='internal.arm.CtsCalendarcommon2TestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCamera b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCamera
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCamera
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsCamera
index 441598e..205c0fa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCamera
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCamera'
+NAME = 'cheets_CTS_P.internal.arm.CtsCamera'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsCamera',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsCamera',
+        tag='internal.arm.CtsCamera',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCameraTestCases.ctshardware
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsCameraTestCases.ctshardware
index dd80545..348b2ea 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCameraTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCameraTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsCameraTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsCameraTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsCameraTestCases.ctshardware',
+        tag='internal.arm.CtsCameraTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsCameraTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', '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_r17.arm.CtsCameraTestCases.noled.camerabox.back b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCameraTestCases.noled.camerabox.back
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsCameraTestCases.noled.camerabox.back
index 599459d..f656934 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.CtsCameraTestCases.noled.camerabox.back'
+NAME = 'cheets_CTS_P.internal.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
@@ -23,14 +23,14 @@
         cmdline_args=args,
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back',
+        tag='internal.arm.CtsCameraTestCases.noled.camerabox.back',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         retry_manual_tests=True,
         timeout=7200)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCameraTestCases.noled.camerabox.front
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsCameraTestCases.noled.camerabox.front
index d736de7..1e4b4f5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.CtsCameraTestCases.noled.camerabox.front'
+NAME = 'cheets_CTS_P.internal.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
@@ -23,14 +23,14 @@
         cmdline_args=args,
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front',
+        tag='internal.arm.CtsCameraTestCases.noled.camerabox.front',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         retry_manual_tests=True,
         timeout=7200)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCarTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsCarTestCases
index 26a8398..64fcd92 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCarTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCarTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsCarTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsCarTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsCarTestCases',
+        tag='internal.arm.CtsCarTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCarrierApiTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarrierApiTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsCarrierApiTestCases
index 11356d9..877815e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCarrierApiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCarrierApiTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsCarrierApiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsCarrierApiTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsCarrierApiTestCases',
+        tag='internal.arm.CtsCarrierApiTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsColorModeTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsColorModeTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsColorModeTestCases
index 70d570b..e909290 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsColorModeTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsColorModeTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsColorModeTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsColorModeTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsColorModeTestCases',
+        tag='internal.arm.CtsColorModeTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCompilationTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCompilationTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsCompilationTestCases
index eef96ba..f7a879c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCompilationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCompilationTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsCompilationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsCompilationTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsCompilationTestCases',
+        tag='internal.arm.CtsCompilationTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsContactsProviderWipe
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContactsProviderWipe
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsContactsProviderWipe
index 929b989..631996b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsContactsProviderWipe
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsContactsProviderWipe'
+NAME = 'cheets_CTS_P.internal.arm.CtsContactsProviderWipe'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsContactsProviderWipe',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsContactsProviderWipe',
+        tag='internal.arm.CtsContactsProviderWipe',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsContentTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContentTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsContentTestCases
index cbe008a..521a42d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsContentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsContentTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsContentTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         enable_default_apps=True,
-        tag='9.0_r17.arm.CtsContentTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsContentTestCases',
+        tag='internal.arm.CtsContentTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         prerequisites=['region_us'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCppToolsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCppToolsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsCppToolsTestCases
index 4d17c20..0f25085 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCppToolsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCppToolsTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsCppToolsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsCppToolsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsCppToolsTestCases',
+        tag='internal.arm.CtsCppToolsTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCurrentApiSignatureTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCurrentApiSignatureTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsCurrentApiSignatureTestCases
index 835d5b1..1887fa4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsCurrentApiSignatureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCurrentApiSignatureTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsCurrentApiSignatureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsCurrentApiSignatureTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsCurrentApiSignatureTestCases',
+        tag='internal.arm.CtsCurrentApiSignatureTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDatabaseTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDatabaseTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDatabaseTestCases
index 2488ac3..ba441ca 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDatabaseTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDatabaseTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsDatabaseTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDatabaseTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDatabaseTestCases',
+        tag='internal.arm.CtsDatabaseTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDebugTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDebugTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDebugTestCases
index c0bf0ed..7516f31 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDebugTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDebugTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsDebugTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDebugTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDebugTestCases',
+        tag='internal.arm.CtsDebugTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.32
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.32
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.32
index 6c27eb5..61ab5ee 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.CtsDeqpTestCases.32'
+NAME = 'cheets_CTS_P.internal.arm.CtsDeqpTestCases.32'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-deqp, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r17.arm.CtsDeqpTestCases.32',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.32',
+        tag='internal.arm.CtsDeqpTestCases.32',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=72000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.64
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.64
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.64
index 983be44..305b19d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.CtsDeqpTestCases.64'
+NAME = 'cheets_CTS_P.internal.arm.CtsDeqpTestCases.64'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-deqp, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r17.arm.CtsDeqpTestCases.64',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.64',
+        tag='internal.arm.CtsDeqpTestCases.64',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=72000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.dEQP-EGL
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.dEQP-EGL
index 681e200..3910a3d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.CtsDeqpTestCases.dEQP-EGL'
+NAME = 'cheets_CTS_P.internal.arm.CtsDeqpTestCases.dEQP-EGL'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL',
+        tag='internal.arm.CtsDeqpTestCases.dEQP-EGL',
+        test_name='cheets_CTS_P.internal.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_r17.arm.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.dEQP-GLES2
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES2
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.dEQP-GLES2
index 8901a48..4ffe526 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.CtsDeqpTestCases.dEQP-GLES2'
+NAME = 'cheets_CTS_P.internal.arm.CtsDeqpTestCases.dEQP-GLES2'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES2',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES2',
+        tag='internal.arm.CtsDeqpTestCases.dEQP-GLES2',
+        test_name='cheets_CTS_P.internal.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_r17.arm.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.dEQP-GLES3
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.dEQP-GLES3
index 680bcd5..bdc994a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.CtsDeqpTestCases.dEQP-GLES3'
+NAME = 'cheets_CTS_P.internal.arm.CtsDeqpTestCases.dEQP-GLES3'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3',
+        tag='internal.arm.CtsDeqpTestCases.dEQP-GLES3',
+        test_name='cheets_CTS_P.internal.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_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
similarity index 80%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
index 13bda77..a495ee8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
+        tag='internal.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases dEQP-GLES3.functional.prerequisite#*', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.dEQP-GLES31
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.dEQP-GLES31
index bf1f778..349c6e4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.CtsDeqpTestCases.dEQP-GLES31'
+NAME = 'cheets_CTS_P.internal.arm.CtsDeqpTestCases.dEQP-GLES31'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31',
+        tag='internal.arm.CtsDeqpTestCases.dEQP-GLES31',
+        test_name='cheets_CTS_P.internal.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_r17.arm.CtsDeqpTestCases.dEQP-VK b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.dEQP-VK
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-VK
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDeqpTestCases.dEQP-VK
index 33b38a0..39cd0dc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-VK
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.CtsDeqpTestCases.dEQP-VK'
+NAME = 'cheets_CTS_P.internal.arm.CtsDeqpTestCases.dEQP-VK'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDeqpTestCases.dEQP-VK',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-VK',
+        tag='internal.arm.CtsDeqpTestCases.dEQP-VK',
+        test_name='cheets_CTS_P.internal.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_r17.arm.CtsDevice b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDevice
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDevice
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDevice
index b9af2ab..ab6f760 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDevice
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDevice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDevice'
+NAME = 'cheets_CTS_P.internal.arm.CtsDevice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDevice',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDevice',
+        tag='internal.arm.CtsDevice',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDexMetadataHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDexMetadataHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDexMetadataHostTestCases
index 2ce2b2b..10b8dfd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDexMetadataHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDexMetadataHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsDexMetadataHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDexMetadataHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDexMetadataHostTestCases',
+        tag='internal.arm.CtsDexMetadataHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDisplayTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDisplayTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDisplayTestCases
index 29a4da2..36531b9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDisplayTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDisplayTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsDisplayTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDisplayTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDisplayTestCases',
+        tag='internal.arm.CtsDisplayTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDpi b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDpi
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDpi
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDpi
index c5368e8..3caea4a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDpi
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDpi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDpi'
+NAME = 'cheets_CTS_P.internal.arm.CtsDpi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDpi',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDpi',
+        tag='internal.arm.CtsDpi',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDreamsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDreamsTestCases
index 186605b..716ddec 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDreamsTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsDreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDreamsTestCases',
+        tag='internal.arm.CtsDreamsTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDrmTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDrmTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDrmTestCases
index 54ce560..81bea4a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDrmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDrmTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsDrmTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDrmTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDrmTestCases',
+        tag='internal.arm.CtsDrmTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDumpsysHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDumpsysHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDumpsysHostTestCases
index dbe5458..af7d9c0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDumpsysHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDumpsysHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsDumpsysHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDumpsysHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDumpsysHostTestCases',
+        tag='internal.arm.CtsDumpsysHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDynamicLinkerTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDynamicLinkerTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsDynamicLinkerTestCases
index df986ea..2ed3bb4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsDynamicLinkerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsDynamicLinkerTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsDynamicLinkerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsDynamicLinkerTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsDynamicLinkerTestCases',
+        tag='internal.arm.CtsDynamicLinkerTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsEdiHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEdiHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsEdiHostTestCases
index 29f1739..196cca2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsEdiHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsEdiHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsEdiHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsEdiHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsEdiHostTestCases',
+        tag='internal.arm.CtsEdiHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsEffectTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEffectTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsEffectTestCases
index 0129283..f263dda 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsEffectTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsEffectTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsEffectTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsEffectTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsEffectTestCases',
+        tag='internal.arm.CtsEffectTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsExternalS b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsExternalS
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsExternalS
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsExternalS
index 1271b5e..cf16639 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsExternalS
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsExternalS
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsExternalS'
+NAME = 'cheets_CTS_P.internal.arm.CtsExternalS'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsExternalS',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsExternalS',
+        tag='internal.arm.CtsExternalS',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsFileSystemTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsFileSystemTestCases
index 68cac47..70607ef 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsFileSystemTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsFileSystemTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsFileSystemTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsFileSystemTestCases',
+        tag='internal.arm.CtsFileSystemTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFragment b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsFragment
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFragment
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsFragment
index 833e41e..339a154 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFragment
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsFragment
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsFragment'
+NAME = 'cheets_CTS_P.internal.arm.CtsFragment'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsFragment',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsFragment',
+        tag='internal.arm.CtsFragment',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsGestureTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGestureTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsGestureTestCases
index 2dc8853..917a560 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsGestureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsGestureTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsGestureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsGestureTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsGestureTestCases',
+        tag='internal.arm.CtsGestureTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsGpuToolsHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGpuToolsHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsGpuToolsHostTestCases
index 2ce0207..d91d9ab 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsGpuToolsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsGpuToolsHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsGpuToolsHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsGpuToolsHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsGpuToolsHostTestCases',
+        tag='internal.arm.CtsGpuToolsHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsGraphicsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGraphicsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsGraphicsTestCases
index 6a34b01..3ee9cb1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsGraphicsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsGraphicsTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsGraphicsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=5,
-        tag='9.0_r17.arm.CtsGraphicsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsGraphicsTestCases',
+        tag='internal.arm.CtsGraphicsTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsHardwareTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHardwareTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsHardwareTestCases
index 6a1531a..c0e1c5b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsHardwareTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsHardwareTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsHardwareTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsHardwareTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsHardwareTestCases',
+        tag='internal.arm.CtsHardwareTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsHarmfulAppWarningHostTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHarmfulAppWarningHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsHarmfulAppWarningHostTestCases
index e2be9ae..45e4628 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsHarmfulAppWarningHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsHarmfulAppWarningHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsHarmfulAppWarningHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsHarmfulAppWarningHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsHarmfulAppWarningHostTestCases',
+        tag='internal.arm.CtsHarmfulAppWarningHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHiddenApi b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsHiddenApi
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHiddenApi
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsHiddenApi
index 96a2061..427cae9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHiddenApi
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsHiddenApi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsHiddenApi'
+NAME = 'cheets_CTS_P.internal.arm.CtsHiddenApi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsHiddenApi',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsHiddenApi',
+        tag='internal.arm.CtsHiddenApi',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=12600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsHostTzDataTests
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostTzDataTests
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsHostTzDataTests
index 2bb11e9..127f514 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsHostTzDataTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsHostTzDataTests'
+NAME = 'cheets_CTS_P.internal.arm.CtsHostTzDataTests'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsHostTzDataTests',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsHostTzDataTests',
+        tag='internal.arm.CtsHostTzDataTests',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostside b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsHostside
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostside
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsHostside
index 2bfce53..4bc5ad2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostside
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsHostside
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsHostside'
+NAME = 'cheets_CTS_P.internal.arm.CtsHostside'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsHostside',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsHostside',
+        tag='internal.arm.CtsHostside',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsIcuTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIcuTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsIcuTestCases
index 2de86be..2408487 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsIcuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsIcuTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsIcuTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsIcuTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsIcuTestCases',
+        tag='internal.arm.CtsIcuTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsIncidentHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIncidentHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsIncidentHostTestCases
index e39cc33..c7ecadd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsIncidentHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsIncidentHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsIncidentHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsIncidentHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsIncidentHostTestCases',
+        tag='internal.arm.CtsIncidentHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsInlineMockingTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInlineMockingTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsInlineMockingTestCases
index 07c51b8..8686ff8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsInlineMockingTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsInlineMockingTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsInlineMockingTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsInlineMockingTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsInlineMockingTestCases',
+        tag='internal.arm.CtsInlineMockingTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInputMethod b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsInputMethod
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInputMethod
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsInputMethod
index 8ec0ea3..178903b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInputMethod
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsInputMethod
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsInputMethod'
+NAME = 'cheets_CTS_P.internal.arm.CtsInputMethod'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsInputMethod',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsInputMethod',
+        tag='internal.arm.CtsInputMethod',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIntentSignatureTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsIntentSignatureTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIntentSignatureTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsIntentSignatureTestCases
index e3f42f3..f54d679 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIntentSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsIntentSignatureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsIntentSignatureTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsIntentSignatureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsIntentSignatureTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsIntentSignatureTestCases',
+        tag='internal.arm.CtsIntentSignatureTestCases',
+        test_name='cheets_CTS_P.internal.arm.CtsIntentSignatureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIntentSignatureTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsIntentSignatureTestCases',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsJankDeviceTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJankDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsJankDeviceTestCases
index fcd8658..4b00986 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsJankDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsJankDeviceTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsJankDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r17.arm.CtsJankDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsJankDeviceTestCases',
+        tag='internal.arm.CtsJankDeviceTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJdwp b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsJdwp
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJdwp
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsJdwp
index e401b0a..12d45a3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJdwp
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsJdwp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsJdwp'
+NAME = 'cheets_CTS_P.internal.arm.CtsJdwp'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsJdwp',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsJdwp',
+        tag='internal.arm.CtsJdwp',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsJniTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJniTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsJniTestCases
index 63b8578..6c23d29 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsJniTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsJniTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsJniTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsJniTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsJniTestCases',
+        tag='internal.arm.CtsJniTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJobScheduler b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsJobScheduler
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJobScheduler
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsJobScheduler
index 171a264..cf6b344 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJobScheduler
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsJobScheduler
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsJobScheduler'
+NAME = 'cheets_CTS_P.internal.arm.CtsJobScheduler'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsJobScheduler',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsJobScheduler',
+        tag='internal.arm.CtsJobScheduler',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=5400)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJvmti b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsJvmti
similarity index 98%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJvmti
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsJvmti
index a0bc031..b04a1e7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJvmti
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsJvmti
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsJvmti'
+NAME = 'cheets_CTS_P.internal.arm.CtsJvmti'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsJvmti',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsJvmti',
+        tag='internal.arm.CtsJvmti',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=26700)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsKernelConfigTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKernelConfigTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsKernelConfigTestCases
index 6e9e80d..fdd7ec4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsKernelConfigTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsKernelConfigTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsKernelConfigTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsKernelConfigTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsKernelConfigTestCases',
+        tag='internal.arm.CtsKernelConfigTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsKeystoreTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKeystoreTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsKeystoreTestCases
index e2af91b..4fd0b96 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsKeystoreTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsKeystoreTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsKeystoreTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsKeystoreTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsKeystoreTestCases',
+        tag='internal.arm.CtsKeystoreTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsLeanbackJankTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLeanbackJankTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsLeanbackJankTestCases
index 7680b5d..036df52 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsLeanbackJankTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsLeanbackJankTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsLeanbackJankTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsLeanbackJankTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsLeanbackJankTestCases',
+        tag='internal.arm.CtsLeanbackJankTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLegacyNotificationTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsLegacyNotificationTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLegacyNotificationTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsLegacyNotificationTestCases
index 56ec255..0b964b2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLegacyNotificationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsLegacyNotificationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsLegacyNotificationTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsLegacyNotificationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsLegacyNotificationTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsLegacyNotificationTestCases',
+        tag='internal.arm.CtsLegacyNotificationTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLibcore b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsLibcore
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLibcore
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsLibcore
index e71f20e..bea447b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLibcore
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsLibcore
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsLibcore'
+NAME = 'cheets_CTS_P.internal.arm.CtsLibcore'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsLibcore',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsLibcore',
+        tag='internal.arm.CtsLibcore',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=21600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsLiblogTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLiblogTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsLiblogTestCases
index ec354b2..d74d3ca 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsLiblogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsLiblogTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsLiblogTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsLiblogTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsLiblogTestCases',
+        tag='internal.arm.CtsLiblogTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLocation b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsLocation
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLocation
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsLocation
index b5e3656..f56377b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLocation
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsLocation
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsLocation'
+NAME = 'cheets_CTS_P.internal.arm.CtsLocation'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsLocation',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsLocation',
+        tag='internal.arm.CtsLocation',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsLogdTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLogdTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsLogdTestCases
index a667db5..f4f2d1b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsLogdTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsLogdTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsLogdTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsLogdTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsLogdTestCases',
+        tag='internal.arm.CtsLogdTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaBitstreamsTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaBitstreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaBitstreamsTestCases
index bb448bb..5525776 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaBitstreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaBitstreamsTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsMediaBitstreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.arm.CtsMediaBitstreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaBitstreamsTestCases',
+        tag='internal.arm.CtsMediaBitstreamsTestCases',
+        test_name='cheets_CTS_P.internal.arm.CtsMediaBitstreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaBitstreamsTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaBitstreamsTestCases',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaHostTestCases
index 8d216a2..e8352c2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsMediaHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsMediaHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaHostTestCases',
+        tag='internal.arm.CtsMediaHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaStressTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaStressTestCases
index 821ec2b..21d9918 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaStressTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaStressTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsMediaStressTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.arm.CtsMediaStressTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaStressTestCases',
+        tag='internal.arm.CtsMediaStressTestCases',
+        test_name='cheets_CTS_P.internal.arm.CtsMediaStressTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaStressTestCases',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         precondition_commands=['cras_test_client --mute 1'],
         timeout=18000)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaStressTestCases.camera.ctshardware
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaStressTestCases.camera.ctshardware
index f974dce..b1cd6cb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaStressTestCases.camera.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsMediaStressTestCases.camera.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware',
+        tag='internal.arm.CtsMediaStressTestCases.camera.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsMediaStressTestCases.camera.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases android.mediastress.cts.MediaRecorderStressTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaStressTestCases.camera',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.32 b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.32
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.32
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.32
index f9af723..2239334 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.CtsMediaTestCases.32'
+NAME = 'cheets_CTS_P.internal.arm.CtsMediaTestCases.32'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.arm.CtsMediaTestCases.32',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.32',
+        tag='internal.arm.CtsMediaTestCases.32',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         precondition_commands=['cras_test_client --mute 1'],
         timeout=36000)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.64 b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.64
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.64
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.64
index e508ced..3e130e9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.CtsMediaTestCases.64'
+NAME = 'cheets_CTS_P.internal.arm.CtsMediaTestCases.64'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.arm.CtsMediaTestCases.64',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.64',
+        tag='internal.arm.CtsMediaTestCases.64',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         precondition_commands=['cras_test_client --mute 1'],
         timeout=36000)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.DecodeAccuracyTest
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.DecodeAccuracyTest
index dcb4011..c1358bd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.DecodeAccuracyTest
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest'
+NAME = 'cheets_CTS_P.internal.arm.CtsMediaTestCases.DecodeAccuracyTest'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest',
+        tag='internal.arm.CtsMediaTestCases.DecodeAccuracyTest',
+        test_name='cheets_CTS_P.internal.arm.CtsMediaTestCases.DecodeAccuracyTest',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
index 08645b7..3256225 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware',
+        tag='internal.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
index 0fa18cf..2fcf3cc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest'
+NAME = 'cheets_CTS_P.internal.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest',
+        tag='internal.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest',
+        test_name='cheets_CTS_P.internal.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--include-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
similarity index 81%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
index 1593412..99825f5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware',
+        tag='internal.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--include-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.audio b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.audio
similarity index 94%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.audio
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.audio
index 81e261a..adbd709 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.audio
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.CtsMediaTestCases.audio'
+NAME = 'cheets_CTS_P.internal.arm.CtsMediaTestCases.audio'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.arm.CtsMediaTestCases.audio',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.audio',
+        tag='internal.arm.CtsMediaTestCases.audio',
+        test_name='cheets_CTS_P.internal.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_r17.arm.CtsMediaTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.ctshardware
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.ctshardware
index ba5ef12..65d2b3f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsMediaTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.arm.CtsMediaTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.ctshardware',
+        tag='internal.arm.CtsMediaTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsMediaTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.other
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.other
index eae7ff6..faf3aa8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.other
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.other'
+NAME = 'cheets_CTS_P.internal.arm.CtsMediaTestCases.other'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r17.arm.CtsMediaTestCases.other',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.other',
+        tag='internal.arm.CtsMediaTestCases.other',
+        test_name='cheets_CTS_P.internal.arm.CtsMediaTestCases.other',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.other.ctshardware
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.other.ctshardware
index dd93b9e..6c85b39 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMediaTestCases.other.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.other.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsMediaTestCases.other.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.arm.CtsMediaTestCases.other.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.other.ctshardware',
+        tag='internal.arm.CtsMediaTestCases.other.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsMediaTestCases.other.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMidiTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMidiTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMidiTestCases
index 8abe764..33288a2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMidiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMidiTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsMidiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsMidiTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMidiTestCases',
+        tag='internal.arm.CtsMidiTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMocking b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMocking
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMocking
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMocking
index 0b9023c..8675447 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMocking
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMocking
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMocking'
+NAME = 'cheets_CTS_P.internal.arm.CtsMocking'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsMocking',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMocking',
+        tag='internal.arm.CtsMocking',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMonkeyTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMonkeyTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMonkeyTestCases
index 3c20c01..1e4e0f5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMonkeyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMonkeyTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsMonkeyTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsMonkeyTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMonkeyTestCases',
+        tag='internal.arm.CtsMonkeyTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMultiUser b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMultiUser
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMultiUser
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsMultiUser
index c596edb..494c9dc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMultiUser
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsMultiUser
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsMultiUser'
+NAME = 'cheets_CTS_P.internal.arm.CtsMultiUser'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsMultiUser',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsMultiUser',
+        tag='internal.arm.CtsMultiUser',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsNNAPITestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNNAPITestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsNNAPITestCases
index f2cbf47..24e4b2c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsNNAPITestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsNNAPITestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsNNAPITestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsNNAPITestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsNNAPITestCases',
+        tag='internal.arm.CtsNNAPITestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNative b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsNative
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNative
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsNative
index c901246..dd9a505 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNative
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsNative
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsNative'
+NAME = 'cheets_CTS_P.internal.arm.CtsNative'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsNative',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsNative',
+        tag='internal.arm.CtsNative',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsNativeMediaAAudioTestCases.ctshardware
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsNativeMediaAAudioTestCases.ctshardware
index b5571b2..305664c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsNativeMediaAAudioTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsNativeMediaAAudioTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware',
+        tag='internal.arm.CtsNativeMediaAAudioTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsNativeMediaAAudioTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNativeMediaAAudioTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsNdefTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNdefTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsNdefTestCases
index fa1a0f7..1da4a9c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsNdefTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsNdefTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsNdefTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsNdefTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsNdefTestCases',
+        tag='internal.arm.CtsNdefTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNet b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsNet
similarity index 94%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNet
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsNet
index 480c1f3..f55ddfe 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNet
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsNet
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsNet'
+NAME = 'cheets_CTS_P.internal.arm.CtsNet'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsNet',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsNet',
+        tag='internal.arm.CtsNet',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         precondition_commands=['android-sh -c \'setprop ctl.start mdnsd\''],
         timeout=30600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNetTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsNetTestCases.ctshardware
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNetTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsNetTestCases.ctshardware
index d043541..1f85776 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNetTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsNetTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsNetTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsNetTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsNetTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsNetTestCases.ctshardware',
+        tag='internal.arm.CtsNetTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsNetTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNetTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsOmapiTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOmapiTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsOmapiTestCases
index bbe9097..58c7dee 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsOmapiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsOmapiTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsOmapiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsOmapiTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsOmapiTestCases',
+        tag='internal.arm.CtsOmapiTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOpenG b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsOpenG
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOpenG
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsOpenG
index 0296945..6364b03 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOpenG
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsOpenG
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsOpenG'
+NAME = 'cheets_CTS_P.internal.arm.CtsOpenG'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r17.arm.CtsOpenG',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsOpenG',
+        tag='internal.arm.CtsOpenG',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOs b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsOs
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOs
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsOs
index cc40bf6..02af46b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOs
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsOs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsOs'
+NAME = 'cheets_CTS_P.internal.arm.CtsOs'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsOs',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsOs',
+        tag='internal.arm.CtsOs',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=5400)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsPdfTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPdfTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsPdfTestCases
index 78e9141..2411f5c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsPdfTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsPdfTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsPdfTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsPdfTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsPdfTestCases',
+        tag='internal.arm.CtsPdfTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsPerfettoTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsPerfettoTestCases
index 6d45b14..6911f79 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsPerfettoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsPerfettoTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsPerfettoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsPerfettoTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsPerfettoTestCases',
+        tag='internal.arm.CtsPerfettoTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsPerfettoTestCases.ctshardware
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsPerfettoTestCases.ctshardware
index 1f1cdec..099c90d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsPerfettoTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsPerfettoTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsPerfettoTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsPerfettoTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsPerfettoTestCases.ctshardware',
+        tag='internal.arm.CtsPerfettoTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsPerfettoTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', '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_r17.arm.CtsPermission b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsPermission
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermission
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsPermission
index ea5d453..3ddbf70 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermission
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsPermission'
+NAME = 'cheets_CTS_P.internal.arm.CtsPermission'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r17.arm.CtsPermission',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsPermission',
+        tag='internal.arm.CtsPermission',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermissionTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsPermissionTestCases.camera.ctshardware
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermissionTestCases.camera.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsPermissionTestCases.camera.ctshardware
index 9711e95..a4eed1d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermissionTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsPermissionTestCases.camera.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsPermissionTestCases.camera.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsPermissionTestCases.camera.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsPermissionTestCases.camera.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsPermissionTestCases.camera.ctshardware',
+        tag='internal.arm.CtsPermissionTestCases.camera.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsPermissionTestCases.camera.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermissionTestCases android.permission.cts.CameraPermissionTest', '--include-filter', 'CtsPermissionTestCases android.permission.cts.Camera2PermissionTest', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPermissionTestCases.camera',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPreference b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsPreference
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPreference
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsPreference
index fce5fcf..7991b8f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPreference
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsPreference
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsPreference'
+NAME = 'cheets_CTS_P.internal.arm.CtsPreference'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsPreference',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsPreference',
+        tag='internal.arm.CtsPreference',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsPrintTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPrintTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsPrintTestCases
index 5274696..2ab711e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsPrintTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsPrintTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsPrintTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsPrintTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsPrintTestCases',
+        tag='internal.arm.CtsPrintTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsProtoTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProtoTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsProtoTestCases
index 5fe0961..f676e88 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsProtoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsProtoTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsProtoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsProtoTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsProtoTestCases',
+        tag='internal.arm.CtsProtoTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsProviderTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProviderTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsProviderTestCases
index a566f20..0aa3697 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsProviderTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsProviderTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsProviderTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsProviderTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsProviderTestCases',
+        tag='internal.arm.CtsProviderTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRenderscript b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsRenderscript
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRenderscript
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsRenderscript
index 62ac0f3..a3513ae 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRenderscript
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsRenderscript
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsRenderscript'
+NAME = 'cheets_CTS_P.internal.arm.CtsRenderscript'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsRenderscript',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsRenderscript',
+        tag='internal.arm.CtsRenderscript',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRs b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsRs
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRs
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsRs
index b502066..8ab32b9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRs
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsRs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsRs'
+NAME = 'cheets_CTS_P.internal.arm.CtsRs'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsRs',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsRs',
+        tag='internal.arm.CtsRs',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSample b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSample
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSample
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSample
index 822933f..e591381 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSample
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSample
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSample'
+NAME = 'cheets_CTS_P.internal.arm.CtsSample'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsSample',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSample',
+        tag='internal.arm.CtsSample',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSaxTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSaxTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSaxTestCases
index 14bfd04..1e3fece 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSaxTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSaxTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsSaxTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsSaxTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSaxTestCases',
+        tag='internal.arm.CtsSaxTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSeccompHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSeccompHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSeccompHostTestCases
index 34fe001..5db3e66 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSeccompHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSeccompHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsSeccompHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsSeccompHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSeccompHostTestCases',
+        tag='internal.arm.CtsSeccompHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSecureElementAccessControl
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecureElementAccessControl
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSecureElementAccessControl
index 45e354d..a884b51 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSecureElementAccessControl
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSecureElementAccessControl'
+NAME = 'cheets_CTS_P.internal.arm.CtsSecureElementAccessControl'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsSecureElementAccessControl',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSecureElementAccessControl',
+        tag='internal.arm.CtsSecureElementAccessControl',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecurity b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSecurity
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecurity
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSecurity
index cf45d40..d99255b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecurity
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSecurity
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSecurity'
+NAME = 'cheets_CTS_P.internal.arm.CtsSecurity'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsSecurity',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSecurity',
+        tag='internal.arm.CtsSecurity',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid', 'modprobe configs'],
         timeout=12600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSelinuxTargetSdk b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSelinuxTargetSdk
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSelinuxTargetSdk
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSelinuxTargetSdk
index 2ff088f..6761c74 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSelinuxTargetSdk
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSelinuxTargetSdk
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSelinuxTargetSdk'
+NAME = 'cheets_CTS_P.internal.arm.CtsSelinuxTargetSdk'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsSelinuxTargetSdk',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSelinuxTargetSdk',
+        tag='internal.arm.CtsSelinuxTargetSdk',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSensorTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSensorTestCases
index 556a035..f0e00b9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSensorTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSensorTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsSensorTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r17.arm.CtsSensorTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSensorTestCases',
+        tag='internal.arm.CtsSensorTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSensorTestCases.ctshardware
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSensorTestCases.ctshardware
index 76d7e09..2ab8eea 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSensorTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSensorTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsSensorTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r17.arm.CtsSensorTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSensorTestCases.ctshardware',
+        tag='internal.arm.CtsSensorTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsSensorTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', '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_r17.arm.CtsShortcut b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsShortcut
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsShortcut
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsShortcut
index cbb5d08..af54d1d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsShortcut
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsShortcut
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsShortcut'
+NAME = 'cheets_CTS_P.internal.arm.CtsShortcut'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsShortcut',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsShortcut',
+        tag='internal.arm.CtsShortcut',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimRestrictedApisTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSimRestrictedApisTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimRestrictedApisTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSimRestrictedApisTestCases
index 49146a8..3adecec 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimRestrictedApisTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSimRestrictedApisTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSimRestrictedApisTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsSimRestrictedApisTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsSimRestrictedApisTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSimRestrictedApisTestCases',
+        tag='internal.arm.CtsSimRestrictedApisTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSimpleCpuTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleCpuTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSimpleCpuTestCases
index 6a24d2e..fd648dd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSimpleCpuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSimpleCpuTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsSimpleCpuTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsSimpleCpuTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSimpleCpuTestCases',
+        tag='internal.arm.CtsSimpleCpuTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSimpleperfTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleperfTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSimpleperfTestCases
index 0781570..8b5a4fe 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSimpleperfTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSimpleperfTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsSimpleperfTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r17.arm.CtsSimpleperfTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSimpleperfTestCases',
+        tag='internal.arm.CtsSimpleperfTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSkQPTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSkQPTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSkQPTestCases
index 37688d7..22c59e4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSkQPTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSkQPTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsSkQPTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsSkQPTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSkQPTestCases',
+        tag='internal.arm.CtsSkQPTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSliceTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSliceTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSliceTestCases
index 3de97ac..4d3bad2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSliceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSliceTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsSliceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsSliceTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSliceTestCases',
+        tag='internal.arm.CtsSliceTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSpeechTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSpeechTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSpeechTestCases
index 45355ba..9e5966e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSpeechTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSpeechTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsSpeechTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r17.arm.CtsSpeechTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSpeechTestCases',
+        tag='internal.arm.CtsSpeechTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsStatsdHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsStatsdHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsStatsdHostTestCases
index d542034..027afb2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsStatsdHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsStatsdHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsStatsdHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsStatsdHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsStatsdHostTestCases',
+        tag='internal.arm.CtsStatsdHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         prerequisites=['bluetooth'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSustainedPerformanceHostTestCases
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSustainedPerformanceHostTestCases
index 5adf2af..ce85f60 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSustainedPerformanceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSustainedPerformanceHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsSustainedPerformanceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsSustainedPerformanceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSustainedPerformanceHostTestCases',
+        tag='internal.arm.CtsSustainedPerformanceHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSustainedPerformanceHostTestCases.ctshardware
similarity index 81%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSustainedPerformanceHostTestCases.ctshardware
index c09224a..2c5146e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSustainedPerformanceHostTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsSustainedPerformanceHostTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware',
+        tag='internal.arm.CtsSustainedPerformanceHostTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsSustainedPerformanceHostTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', '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_r17.arm.CtsSync b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSync
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSync
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSync
index 20c2004..decf46a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSync
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSync
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSync'
+NAME = 'cheets_CTS_P.internal.arm.CtsSync'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsSync',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSync',
+        tag='internal.arm.CtsSync',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSystem b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSystem
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSystem
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsSystem
index 13d28fc..1d4d9f9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSystem
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsSystem
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsSystem'
+NAME = 'cheets_CTS_P.internal.arm.CtsSystem'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsSystem',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsSystem',
+        tag='internal.arm.CtsSystem',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelecom b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsTelecom
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelecom
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsTelecom
index fc3986a..281df98 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelecom
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsTelecom
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsTelecom'
+NAME = 'cheets_CTS_P.internal.arm.CtsTelecom'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r17.arm.CtsTelecom',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsTelecom',
+        tag='internal.arm.CtsTelecom',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelephony b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsTelephony
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelephony
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsTelephony
index 8bbeea2..a0fa8ac 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelephony
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsTelephony
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsTelephony'
+NAME = 'cheets_CTS_P.internal.arm.CtsTelephony'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r17.arm.CtsTelephony',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsTelephony',
+        tag='internal.arm.CtsTelephony',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsTextTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTextTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsTextTestCases
index 2d46195..f728fa4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsTextTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsTextTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsTextTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsTextTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsTextTestCases',
+        tag='internal.arm.CtsTextTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTheme b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsTheme
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTheme
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsTheme
index 0c752a7..131a5e2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTheme
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsTheme
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsTheme'
+NAME = 'cheets_CTS_P.internal.arm.CtsTheme'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,15 +22,15 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r17.arm.CtsTheme',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsTheme',
+        tag='internal.arm.CtsTheme',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
         extra_artifacts_host=['/tmp/diff_*.png'],
-        uri='LATEST',
+        uri='DEV',
         prerequisites=['region_us'],
         timeout=5400)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsToast b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsToast
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsToast
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsToast
index c06c61a..993207a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsToast
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsToast
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsToast'
+NAME = 'cheets_CTS_P.internal.arm.CtsToast'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsToast',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsToast',
+        tag='internal.arm.CtsToast',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsTransitionTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTransitionTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsTransitionTestCases
index d2236a2..0fbe76b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsTransitionTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsTransitionTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsTransitionTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r17.arm.CtsTransitionTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsTransitionTestCases',
+        tag='internal.arm.CtsTransitionTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsTrustedVoiceHostTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTrustedVoiceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsTrustedVoiceHostTestCases
index ecdcfda..2174a3f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsTrustedVoiceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsTrustedVoiceHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsTrustedVoiceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsTrustedVoiceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsTrustedVoiceHostTestCases',
+        tag='internal.arm.CtsTrustedVoiceHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTv b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsTv
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTv
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsTv
index dd01119..a5f1e6b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTv
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsTv
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsTv'
+NAME = 'cheets_CTS_P.internal.arm.CtsTv'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r17.arm.CtsTv',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsTv',
+        tag='internal.arm.CtsTv',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUi b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsUi
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUi
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsUi
index d1737cf..d1b8056 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUi
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsUi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsUi'
+NAME = 'cheets_CTS_P.internal.arm.CtsUi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsUi',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsUi',
+        tag='internal.arm.CtsUi',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsUidIsolationTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUidIsolationTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsUidIsolationTestCases
index 609bf1b..123da6a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsUidIsolationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsUidIsolationTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsUidIsolationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsUidIsolationTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsUidIsolationTestCases',
+        tag='internal.arm.CtsUidIsolationTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsUsageStatsTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsUsageStatsTestCases
index 39176f2..12f7436 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsUsageStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsUsageStatsTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsUsageStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsUsageStatsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsUsageStatsTestCases',
+        tag='internal.arm.CtsUsageStatsTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsUsageStatsTestCases.ctshardware
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsUsageStatsTestCases.ctshardware
index 175516f..c83cd50 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsUsageStatsTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsUsageStatsTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsUsageStatsTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsUsageStatsTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsUsageStatsTestCases.ctshardware',
+        tag='internal.arm.CtsUsageStatsTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsUsageStatsTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', '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_r17.arm.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsUsbTests
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsbTests
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsUsbTests
index f0a9df4..2b56ab8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsUsbTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsUsbTests'
+NAME = 'cheets_CTS_P.internal.arm.CtsUsbTests'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r17.arm.CtsUsbTests',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsUsbTests',
+        tag='internal.arm.CtsUsbTests',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsUtilTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUtilTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsUtilTestCases
index 43995e5..02711f2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsUtilTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsUtilTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsUtilTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsUtilTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsUtilTestCases',
+        tag='internal.arm.CtsUtilTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsVideoTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVideoTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsVideoTestCases
index 94ba8de..5348084 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsVideoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsVideoTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsVideoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsVideoTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsVideoTestCases',
+        tag='internal.arm.CtsVideoTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.32 b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsViewTestCases.32
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.32
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsViewTestCases.32
index 4db2e8b..a3a22de 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsViewTestCases.32
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsViewTestCases.32'
+NAME = 'cheets_CTS_P.internal.arm.CtsViewTestCases.32'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,15 +21,15 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsViewTestCases.32',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsViewTestCases.32',
+        tag='internal.arm.CtsViewTestCases.32',
+        test_name='cheets_CTS_P.internal.arm.CtsViewTestCases.32',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--abi', 'armeabi-v7a', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsViewTestCases',
         target_plan=None,
         bundle='arm',
         extra_artifacts=['/storage/emulated/0/SurfaceViewSyncTest/'],
-        uri='LATEST',
+        uri='DEV',
         precondition_commands=['sleep 60'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.64 b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsViewTestCases.64
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.64
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsViewTestCases.64
index a9f50a2..aadb969 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsViewTestCases.64
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsViewTestCases.64'
+NAME = 'cheets_CTS_P.internal.arm.CtsViewTestCases.64'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,15 +21,15 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsViewTestCases.64',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsViewTestCases.64',
+        tag='internal.arm.CtsViewTestCases.64',
+        test_name='cheets_CTS_P.internal.arm.CtsViewTestCases.64',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--abi', 'arm64-v8a', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsViewTestCases',
         target_plan=None,
         bundle='arm',
         extra_artifacts=['/storage/emulated/0/SurfaceViewSyncTest/'],
-        uri='LATEST',
+        uri='DEV',
         precondition_commands=['sleep 60'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsViewTestCases.ctshardware
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsViewTestCases.ctshardware
index da90877..06db88b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsViewTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsViewTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.arm.CtsViewTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsViewTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsViewTestCases.ctshardware',
+        tag='internal.arm.CtsViewTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.arm.CtsViewTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', '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_r17.arm.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsVmTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVmTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsVmTestCases
index 3451d8f..e6c8e10 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsVmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsVmTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsVmTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsVmTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsVmTestCases',
+        tag='internal.arm.CtsVmTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVoice b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsVoice
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVoice
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsVoice
index 5e9d085..13cd164 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVoice
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsVoice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsVoice'
+NAME = 'cheets_CTS_P.internal.arm.CtsVoice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r17.arm.CtsVoice',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsVoice',
+        tag='internal.arm.CtsVoice',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsVrTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVrTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsVrTestCases
index b6249c7..9dcb5e0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsVrTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsVrTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsVrTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsVrTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsVrTestCases',
+        tag='internal.arm.CtsVrTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsWebkitTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWebkitTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsWebkitTestCases
index 0c2f3d0..9842a80 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsWebkitTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsWebkitTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsWebkitTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsWebkitTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsWebkitTestCases',
+        tag='internal.arm.CtsWebkitTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         prerequisites=['region_us'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsWidgetTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWidgetTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsWidgetTestCases
index 8a2b27c..907382b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsWidgetTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsWidgetTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsWidgetTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsWidgetTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsWidgetTestCases',
+        tag='internal.arm.CtsWidgetTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsWindowManagerDeviceTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWindowManagerDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsWindowManagerDeviceTestCases
index 81cfffc..f96bb5a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsWindowManagerDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsWindowManagerDeviceTestCases'
+NAME = 'cheets_CTS_P.internal.arm.CtsWindowManagerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsWindowManagerDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsWindowManagerDeviceTestCases',
+        tag='internal.arm.CtsWindowManagerDeviceTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWrap b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsWrap
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWrap
rename to server/site_tests/cheets_CTS_P/control.internal.arm.CtsWrap
index 73cfc5c..afd741a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWrap
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.CtsWrap
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.CtsWrap'
+NAME = 'cheets_CTS_P.internal.arm.CtsWrap'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.CtsWrap',
-        test_name='cheets_CTS_P.9.0_r17.arm.CtsWrap',
+        tag='internal.arm.CtsWrap',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
similarity index 81%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
index 7636f92..5ff390f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
+        tag='internal.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
similarity index 78%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
index 3252a6a..7f0fdb9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
+        tag='internal.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
similarity index 81%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
index df89ea7..39b637f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
+        tag='internal.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
similarity index 79%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
index df4c5b2..94d1ab9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
+        tag='internal.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
similarity index 93%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
index 84137a3..6a6431a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         enable_default_apps=True,
-        tag='9.0_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
+        tag='internal.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
index 237ae7e..1bccc76 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
+        tag='internal.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
index 621254b..7547e55 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
+        tag='internal.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
index 352d294..b52e67a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
+        tag='internal.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
similarity index 81%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
index 6bbe168..5dd1340 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        tag='internal.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
similarity index 92%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
index a67613c..98b1fad 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
+        tag='internal.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
similarity index 97%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
index 5d10e94..ef9d3a9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
+        tag='internal.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
similarity index 79%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
index 2d6c66c..1d87e9c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
+        tag='internal.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
similarity index 81%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
index 5c4fbcd..2d34394 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
+        tag='internal.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
similarity index 81%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
index 419f2d9..465ae06 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
+        tag='internal.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32 b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32
index 380ea15..e147157 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32',
+        tag='internal.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64 b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64
index 7d05741..539d030 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64',
+        tag='internal.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
similarity index 95%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
index b73f403..8bb5bb1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
+        tag='internal.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
index 31f5ce7..f526089 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
+        tag='internal.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
index c5e4594..c41476a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
+        tag='internal.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
index ebf1141..dda7de4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsSensorTestCases_-_CtsSensorTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
+        tag='internal.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
similarity index 93%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
index a2f3cf4..73191d3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
+        tag='internal.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.32 b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsViewTestCases_-_CtsViewTestCases.32
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.32
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsViewTestCases_-_CtsViewTestCases.32
index 3907277..5fc8c4c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsViewTestCases_-_CtsViewTestCases.32
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.32'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsViewTestCases_-_CtsViewTestCases.32'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.32',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.32',
+        tag='internal.arm.all.CtsViewTestCases_-_CtsViewTestCases.32',
+        test_name='cheets_CTS_P.internal.arm.all.CtsViewTestCases_-_CtsViewTestCases.32',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--abi', 'armeabi-v7a', '--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_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.64 b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsViewTestCases_-_CtsViewTestCases.64
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.64
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsViewTestCases_-_CtsViewTestCases.64
index 13326f9..aeab19e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsViewTestCases_-_CtsViewTestCases.64
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.64'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsViewTestCases_-_CtsViewTestCases.64'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.64',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.64',
+        tag='internal.arm.all.CtsViewTestCases_-_CtsViewTestCases.64',
+        test_name='cheets_CTS_P.internal.arm.all.CtsViewTestCases_-_CtsViewTestCases.64',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--abi', 'arm64-v8a', '--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_r17.arm.all.CtsVmTestCases_-_vm-tests-tf b/server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsVmTestCases_-_vm-tests-tf
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsVmTestCases_-_vm-tests-tf
rename to server/site_tests/cheets_CTS_P/control.internal.arm.all.CtsVmTestCases_-_vm-tests-tf
index e1bf6cb..90abb02 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsVmTestCases_-_vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.all.CtsVmTestCases_-_vm-tests-tf'
+NAME = 'cheets_CTS_P.internal.arm.all.CtsVmTestCases_-_vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.arm.all.CtsVmTestCases_-_vm-tests-tf',
-        test_name='cheets_CTS_P.9.0_r17.arm.all.CtsVmTestCases_-_vm-tests-tf',
+        tag='internal.arm.all.CtsVmTestCases_-_vm-tests-tf',
+        test_name='cheets_CTS_P.internal.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_r17.arm.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.internal.arm.cts-system-all.api
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.cts-system-all.api
rename to server/site_tests/cheets_CTS_P/control.internal.arm.cts-system-all.api
index f25f313..7c53173 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.cts-system-all.api'
+NAME = 'cheets_CTS_P.internal.arm.cts-system-all.api'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.cts-system-all.api',
-        test_name='cheets_CTS_P.9.0_r17.arm.cts-system-all.api',
+        tag='internal.arm.cts-system-all.api',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.signed-CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.internal.arm.signed-CtsSecureElementAccessControl
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.signed-CtsSecureElementAccessControl
rename to server/site_tests/cheets_CTS_P/control.internal.arm.signed-CtsSecureElementAccessControl
index bd34fd8..dc177e7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.signed-CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.signed-CtsSecureElementAccessControl'
+NAME = 'cheets_CTS_P.internal.arm.signed-CtsSecureElementAccessControl'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.signed-CtsSecureElementAccessControl',
-        test_name='cheets_CTS_P.9.0_r17.arm.signed-CtsSecureElementAccessControl',
+        tag='internal.arm.signed-CtsSecureElementAccessControl',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.tradefed-run-collect-tests-only-hardware-internal b/server/site_tests/cheets_CTS_P/control.internal.arm.tradefed-run-collect-tests-only-hardware-internal
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.tradefed-run-collect-tests-only-hardware-internal
rename to server/site_tests/cheets_CTS_P/control.internal.arm.tradefed-run-collect-tests-only-hardware-internal
index a0c59fa..fdb3b42 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.tradefed-run-collect-tests-only-hardware-internal
+++ b/server/site_tests/cheets_CTS_P/control.internal.arm.tradefed-run-collect-tests-only-hardware-internal
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.arm.tradefed-run-collect-tests-only-hardware-internal'
+NAME = 'cheets_CTS_P.internal.arm.tradefed-run-collect-tests-only-hardware-internal'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.tradefed-run-collect-tests-only-hardware-internal',
-        test_name='cheets_CTS_P.9.0_r17.arm.tradefed-run-collect-tests-only-hardware-internal',
+        tag='internal.arm.tradefed-run-collect-tests-only-hardware-internal',
+        test_name='cheets_CTS_P.internal.arm.tradefed-run-collect-tests-only-hardware-internal',
         run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--subplan', 'cts-hardware', '--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=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='tradefed-run-collect-tests-only-hardware-internal',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.internal.arm.vm-tests-tf
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.vm-tests-tf
rename to server/site_tests/cheets_CTS_P/control.internal.arm.vm-tests-tf
index 0515142..9aa4467 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.vm-tests-tf'
+NAME = 'cheets_CTS_P.internal.arm.vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.vm-tests-tf',
-        test_name='cheets_CTS_P.9.0_r17.arm.vm-tests-tf',
+        tag='internal.arm.vm-tests-tf',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='arm',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.wm-presubmit b/server/site_tests/cheets_CTS_P/control.internal.arm.wm-presubmit
similarity index 92%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.arm.wm-presubmit
rename to server/site_tests/cheets_CTS_P/control.internal.arm.wm-presubmit
index 2e322e0..f1f486b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.wm-presubmit
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.arm.wm-presubmit'
+NAME = 'cheets_CTS_P.internal.arm.wm-presubmit'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:smoke'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.arm.wm-presubmit',
-        test_name='cheets_CTS_P.9.0_r17.arm.wm-presubmit',
+        tag='internal.arm.wm-presubmit',
+        test_name='cheets_CTS_P.internal.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_r17.x86.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAbiOverrideHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAbiOverrideHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsAbiOverrideHostTestCases
index 85e040a..e1b82ab 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAbiOverrideHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAbiOverrideHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsAbiOverrideHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsAbiOverrideHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsAbiOverrideHostTestCases',
+        tag='internal.x86.CtsAbiOverrideHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAccelerationTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccelerationTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsAccelerationTestCases
index c41165f..78d9c1c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAccelerationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAccelerationTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsAccelerationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsAccelerationTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsAccelerationTestCases',
+        tag='internal.x86.CtsAccelerationTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccessibility b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAccessibility
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccessibility
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsAccessibility
index a8d9ad9..d2649af 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAccessibility
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAccessibility'
+NAME = 'cheets_CTS_P.internal.x86.CtsAccessibility'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsAccessibility',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsAccessibility',
+        tag='internal.x86.CtsAccessibility',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAccountManagerTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsAccountManagerTestCases
index 77fbb4a..a47ce22 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAccountManagerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsAccountManagerTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsAccountManagerTestCases',
+        tag='internal.x86.CtsAccountManagerTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsActivityManagerDevice
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsActivityManagerDevice
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsActivityManagerDevice
index 21927cf..39db52d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsActivityManagerDevice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsActivityManagerDevice'
+NAME = 'cheets_CTS_P.internal.x86.CtsActivityManagerDevice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsActivityManagerDevice',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsActivityManagerDevice',
+        tag='internal.x86.CtsActivityManagerDevice',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAdmin b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAdmin
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAdmin
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsAdmin
index 2076074..26674fd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAdmin
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAdmin
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAdmin'
+NAME = 'cheets_CTS_P.internal.x86.CtsAdmin'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsAdmin',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsAdmin',
+        tag='internal.x86.CtsAdmin',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAlarm b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAlarm
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAlarm
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsAlarm
index c56d15a..e668520 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAlarm
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAlarm
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAlarm'
+NAME = 'cheets_CTS_P.internal.x86.CtsAlarm'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsAlarm',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsAlarm',
+        tag='internal.x86.CtsAlarm',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAndroid b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAndroid
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAndroid
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsAndroid
index 95688c0..95a0d27 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAndroid
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAndroid
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAndroid'
+NAME = 'cheets_CTS_P.internal.x86.CtsAndroid'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsAndroid',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsAndroid',
+        tag='internal.x86.CtsAndroid',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAnimationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAnimationTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsAnimationTestCases
index b5eb66e..8975223 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAnimationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAnimationTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsAnimationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsAnimationTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsAnimationTestCases',
+        tag='internal.x86.CtsAnimationTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApacheHttpLegacy b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsApacheHttpLegacy
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApacheHttpLegacy
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsApacheHttpLegacy
index 58d8b39..dd4b617 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApacheHttpLegacy
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsApacheHttpLegacy
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsApacheHttpLegacy'
+NAME = 'cheets_CTS_P.internal.x86.CtsApacheHttpLegacy'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsApacheHttpLegacy',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsApacheHttpLegacy',
+        tag='internal.x86.CtsApacheHttpLegacy',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApp b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsApp
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApp
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsApp
index 5946567..fbb2957 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApp
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsApp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsApp'
+NAME = 'cheets_CTS_P.internal.x86.CtsApp'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         enable_default_apps=True,
-        tag='9.0_r17.x86.CtsApp',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsApp',
+        tag='internal.x86.CtsApp',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=23400)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAppTestCases.feature.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAppTestCases.feature.ctshardware
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAppTestCases.feature.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsAppTestCases.feature.ctshardware
index 4799f89..77601bf 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAppTestCases.feature.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAppTestCases.feature.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAppTestCases.feature.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsAppTestCases.feature.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsAppTestCases.feature.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsAppTestCases.feature.ctshardware',
+        tag='internal.x86.CtsAppTestCases.feature.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsAppTestCases.feature.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppTestCases android.app.cts.SystemFeaturesTest', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAppTestCases.feature',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAslrMallocTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAslrMallocTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsAslrMallocTestCases
index 23ee1a2..d9d01e6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAslrMallocTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAslrMallocTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsAslrMallocTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsAslrMallocTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsAslrMallocTestCases',
+        tag='internal.x86.CtsAslrMallocTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAssistTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAssistTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsAssistTestCases
index da03227..bcf5a9d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAssistTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAssistTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsAssistTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsAssistTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsAssistTestCases',
+        tag='internal.x86.CtsAssistTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAtraceHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAtraceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsAtraceHostTestCases
index 2b6a628f..fd01b3c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAtraceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAtraceHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsAtraceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsAtraceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsAtraceHostTestCases',
+        tag='internal.x86.CtsAtraceHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAutoFillServiceTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAutoFillServiceTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsAutoFillServiceTestCases
index 2ec284d..c05bc41 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsAutoFillServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsAutoFillServiceTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsAutoFillServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsAutoFillServiceTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsAutoFillServiceTestCases',
+        tag='internal.x86.CtsAutoFillServiceTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=21600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsBackgroundRestrictionsTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackgroundRestrictionsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsBackgroundRestrictionsTestCases
index 4a9a325..f46addc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsBackgroundRestrictionsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsBackgroundRestrictionsTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsBackgroundRestrictionsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsBackgroundRestrictionsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsBackgroundRestrictionsTestCases',
+        tag='internal.x86.CtsBackgroundRestrictionsTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackup b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsBackup
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackup
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsBackup
index 9831a55..b844588 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackup
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsBackup
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsBackup'
+NAME = 'cheets_CTS_P.internal.x86.CtsBackup'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsBackup',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsBackup',
+        tag='internal.x86.CtsBackup',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsBatterySavingTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBatterySavingTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsBatterySavingTestCases
index 0510244..596f8c8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsBatterySavingTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsBatterySavingTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsBatterySavingTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsBatterySavingTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsBatterySavingTestCases',
+        tag='internal.x86.CtsBatterySavingTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsBionicTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBionicTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsBionicTestCases
index aceb208..b02825d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsBionicTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsBionicTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsBionicTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsBionicTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsBionicTestCases',
+        tag='internal.x86.CtsBionicTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsBluetoothTestCases
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBluetoothTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsBluetoothTestCases
index 2fe946d..c3c441e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsBluetoothTestCases
@@ -7,7 +7,7 @@
 from autotest_lib.server import utils
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsBluetoothTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsBluetoothTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -34,14 +34,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsBluetoothTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsBluetoothTestCases',
+        tag='internal.x86.CtsBluetoothTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         prerequisites=['bluetooth'],
         hard_reboot_on_failure=True,
         timeout=3600)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsBootStatsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBootStatsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsBootStatsTestCases
index 540101a..d600c09 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsBootStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsBootStatsTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsBootStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsBootStatsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsBootStatsTestCases',
+        tag='internal.x86.CtsBootStatsTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCalendarcommon2TestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCalendarcommon2TestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsCalendarcommon2TestCases
index 85b915c..c65382a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCalendarcommon2TestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCalendarcommon2TestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsCalendarcommon2TestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsCalendarcommon2TestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsCalendarcommon2TestCases',
+        tag='internal.x86.CtsCalendarcommon2TestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCamera b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCamera
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCamera
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsCamera
index 1d213f6..55f0246 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCamera
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCamera'
+NAME = 'cheets_CTS_P.internal.x86.CtsCamera'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsCamera',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsCamera',
+        tag='internal.x86.CtsCamera',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCameraTestCases.ctshardware
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsCameraTestCases.ctshardware
index d668d9b..66ddf1f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCameraTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCameraTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsCameraTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsCameraTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsCameraTestCases.ctshardware',
+        tag='internal.x86.CtsCameraTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsCameraTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', '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_r17.x86.CtsCameraTestCases.noled.camerabox.back b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCameraTestCases.noled.camerabox.back
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsCameraTestCases.noled.camerabox.back
index a5dd69a..a6f02b0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.CtsCameraTestCases.noled.camerabox.back'
+NAME = 'cheets_CTS_P.internal.x86.CtsCameraTestCases.noled.camerabox.back'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc, cts_abi_x86, camerabox_light:noled, camerabox_facing:back'
 JOB_RETRIES = 1
@@ -23,14 +23,14 @@
         cmdline_args=args,
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back',
+        tag='internal.x86.CtsCameraTestCases.noled.camerabox.back',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         retry_manual_tests=True,
         timeout=7200)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCameraTestCases.noled.camerabox.front
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsCameraTestCases.noled.camerabox.front
index 332d953..e270464 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.CtsCameraTestCases.noled.camerabox.front'
+NAME = 'cheets_CTS_P.internal.x86.CtsCameraTestCases.noled.camerabox.front'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc, cts_abi_x86, camerabox_light:noled, camerabox_facing:front'
 JOB_RETRIES = 1
@@ -23,14 +23,14 @@
         cmdline_args=args,
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front',
+        tag='internal.x86.CtsCameraTestCases.noled.camerabox.front',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         retry_manual_tests=True,
         timeout=7200)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCarTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsCarTestCases
index d6efd41..991bf8a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCarTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCarTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsCarTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsCarTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsCarTestCases',
+        tag='internal.x86.CtsCarTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCarrierApiTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarrierApiTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsCarrierApiTestCases
index ede7f50..faf70c9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCarrierApiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCarrierApiTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsCarrierApiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsCarrierApiTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsCarrierApiTestCases',
+        tag='internal.x86.CtsCarrierApiTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsColorModeTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsColorModeTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsColorModeTestCases
index 472cee5..5684847 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsColorModeTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsColorModeTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsColorModeTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsColorModeTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsColorModeTestCases',
+        tag='internal.x86.CtsColorModeTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCompilationTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCompilationTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsCompilationTestCases
index 1927357..e0e7df0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCompilationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCompilationTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsCompilationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsCompilationTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsCompilationTestCases',
+        tag='internal.x86.CtsCompilationTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsContactsProviderWipe
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContactsProviderWipe
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsContactsProviderWipe
index 68e4330..34c7aa6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsContactsProviderWipe
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsContactsProviderWipe'
+NAME = 'cheets_CTS_P.internal.x86.CtsContactsProviderWipe'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsContactsProviderWipe',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsContactsProviderWipe',
+        tag='internal.x86.CtsContactsProviderWipe',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsContentTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContentTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsContentTestCases
index c42c780..19f0c16 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsContentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsContentTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsContentTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         enable_default_apps=True,
-        tag='9.0_r17.x86.CtsContentTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsContentTestCases',
+        tag='internal.x86.CtsContentTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         prerequisites=['region_us'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCppToolsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCppToolsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsCppToolsTestCases
index 3f0e07d..6702730 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCppToolsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCppToolsTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsCppToolsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsCppToolsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsCppToolsTestCases',
+        tag='internal.x86.CtsCppToolsTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCurrentApiSignatureTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCurrentApiSignatureTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsCurrentApiSignatureTestCases
index cd3992f..8492b76 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsCurrentApiSignatureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCurrentApiSignatureTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsCurrentApiSignatureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsCurrentApiSignatureTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsCurrentApiSignatureTestCases',
+        tag='internal.x86.CtsCurrentApiSignatureTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDatabaseTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDatabaseTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDatabaseTestCases
index eeea31c..d8d1f13 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDatabaseTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDatabaseTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsDatabaseTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDatabaseTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDatabaseTestCases',
+        tag='internal.x86.CtsDatabaseTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDebugTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDebugTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDebugTestCases
index 302e40e..db2d38c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDebugTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDebugTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsDebugTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDebugTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDebugTestCases',
+        tag='internal.x86.CtsDebugTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.32
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.32
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.32
index 26ad15b..d0a91fb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.CtsDeqpTestCases.32'
+NAME = 'cheets_CTS_P.internal.x86.CtsDeqpTestCases.32'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-deqp, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r17.x86.CtsDeqpTestCases.32',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.32',
+        tag='internal.x86.CtsDeqpTestCases.32',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=72000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.64
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.64
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.64
index 6f562dd..a62fb2c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.CtsDeqpTestCases.64'
+NAME = 'cheets_CTS_P.internal.x86.CtsDeqpTestCases.64'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-deqp, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r17.x86.CtsDeqpTestCases.64',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.64',
+        tag='internal.x86.CtsDeqpTestCases.64',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=72000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.dEQP-EGL
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.dEQP-EGL
index eb8a2ae..c6f1d0d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.CtsDeqpTestCases.dEQP-EGL'
+NAME = 'cheets_CTS_P.internal.x86.CtsDeqpTestCases.dEQP-EGL'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL',
+        tag='internal.x86.CtsDeqpTestCases.dEQP-EGL',
+        test_name='cheets_CTS_P.internal.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_r17.x86.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.dEQP-GLES2
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES2
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.dEQP-GLES2
index cf906e3..3785a89 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.CtsDeqpTestCases.dEQP-GLES2'
+NAME = 'cheets_CTS_P.internal.x86.CtsDeqpTestCases.dEQP-GLES2'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES2',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES2',
+        tag='internal.x86.CtsDeqpTestCases.dEQP-GLES2',
+        test_name='cheets_CTS_P.internal.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_r17.x86.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.dEQP-GLES3
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.dEQP-GLES3
index 6dc47f9..8c1cdda 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.CtsDeqpTestCases.dEQP-GLES3'
+NAME = 'cheets_CTS_P.internal.x86.CtsDeqpTestCases.dEQP-GLES3'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3',
+        tag='internal.x86.CtsDeqpTestCases.dEQP-GLES3',
+        test_name='cheets_CTS_P.internal.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_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
similarity index 80%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
index 1b64d29..b80138a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
+        tag='internal.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases dEQP-GLES3.functional.prerequisite#*', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.dEQP-GLES31
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.dEQP-GLES31
index 4d31640..8d52de3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.CtsDeqpTestCases.dEQP-GLES31'
+NAME = 'cheets_CTS_P.internal.x86.CtsDeqpTestCases.dEQP-GLES31'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31',
+        tag='internal.x86.CtsDeqpTestCases.dEQP-GLES31',
+        test_name='cheets_CTS_P.internal.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_r17.x86.CtsDeqpTestCases.dEQP-VK b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.dEQP-VK
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-VK
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDeqpTestCases.dEQP-VK
index 32280db..b19ba6c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-VK
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.CtsDeqpTestCases.dEQP-VK'
+NAME = 'cheets_CTS_P.internal.x86.CtsDeqpTestCases.dEQP-VK'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDeqpTestCases.dEQP-VK',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-VK',
+        tag='internal.x86.CtsDeqpTestCases.dEQP-VK',
+        test_name='cheets_CTS_P.internal.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_r17.x86.CtsDevice b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDevice
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDevice
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDevice
index 000ec4f..5760c73 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDevice
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDevice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDevice'
+NAME = 'cheets_CTS_P.internal.x86.CtsDevice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDevice',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDevice',
+        tag='internal.x86.CtsDevice',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDexMetadataHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDexMetadataHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDexMetadataHostTestCases
index 0610a59..e6ea0ed 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDexMetadataHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDexMetadataHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsDexMetadataHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDexMetadataHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDexMetadataHostTestCases',
+        tag='internal.x86.CtsDexMetadataHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDisplayTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDisplayTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDisplayTestCases
index b79c10b..7ac43c5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDisplayTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDisplayTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsDisplayTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDisplayTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDisplayTestCases',
+        tag='internal.x86.CtsDisplayTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDpi b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDpi
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDpi
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDpi
index 7cb1026..eafefd1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDpi
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDpi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDpi'
+NAME = 'cheets_CTS_P.internal.x86.CtsDpi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDpi',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDpi',
+        tag='internal.x86.CtsDpi',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDreamsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDreamsTestCases
index cc8aa2a..f18b7c1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDreamsTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsDreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDreamsTestCases',
+        tag='internal.x86.CtsDreamsTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDrmTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDrmTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDrmTestCases
index 683f8f4..903cb68 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDrmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDrmTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsDrmTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDrmTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDrmTestCases',
+        tag='internal.x86.CtsDrmTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDumpsysHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDumpsysHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDumpsysHostTestCases
index f07198d..3816a81 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDumpsysHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDumpsysHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsDumpsysHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDumpsysHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDumpsysHostTestCases',
+        tag='internal.x86.CtsDumpsysHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDynamicLinkerTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDynamicLinkerTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsDynamicLinkerTestCases
index ec66617..2211a49 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsDynamicLinkerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsDynamicLinkerTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsDynamicLinkerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsDynamicLinkerTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsDynamicLinkerTestCases',
+        tag='internal.x86.CtsDynamicLinkerTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsEdiHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEdiHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsEdiHostTestCases
index 125fb00..1cdf996 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsEdiHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsEdiHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsEdiHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsEdiHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsEdiHostTestCases',
+        tag='internal.x86.CtsEdiHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsEffectTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEffectTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsEffectTestCases
index cd5e7bb..a4bfe6a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsEffectTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsEffectTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsEffectTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsEffectTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsEffectTestCases',
+        tag='internal.x86.CtsEffectTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsExternalS b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsExternalS
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsExternalS
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsExternalS
index 2a9f080..ac6e0ea 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsExternalS
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsExternalS
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsExternalS'
+NAME = 'cheets_CTS_P.internal.x86.CtsExternalS'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsExternalS',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsExternalS',
+        tag='internal.x86.CtsExternalS',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsFileSystemTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsFileSystemTestCases
index 4898a77..0885079 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsFileSystemTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsFileSystemTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsFileSystemTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsFileSystemTestCases',
+        tag='internal.x86.CtsFileSystemTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFragment b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsFragment
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFragment
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsFragment
index a57b3f3..a871cf3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFragment
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsFragment
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsFragment'
+NAME = 'cheets_CTS_P.internal.x86.CtsFragment'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsFragment',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsFragment',
+        tag='internal.x86.CtsFragment',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsGestureTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGestureTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsGestureTestCases
index 7bcfc22..9bfefd0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsGestureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsGestureTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsGestureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsGestureTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsGestureTestCases',
+        tag='internal.x86.CtsGestureTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsGpuToolsHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGpuToolsHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsGpuToolsHostTestCases
index cc33a29..b369157 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsGpuToolsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsGpuToolsHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsGpuToolsHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsGpuToolsHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsGpuToolsHostTestCases',
+        tag='internal.x86.CtsGpuToolsHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsGraphicsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGraphicsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsGraphicsTestCases
index 9188d70..ee1bd88 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsGraphicsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsGraphicsTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsGraphicsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=5,
-        tag='9.0_r17.x86.CtsGraphicsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsGraphicsTestCases',
+        tag='internal.x86.CtsGraphicsTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsHardwareTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHardwareTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsHardwareTestCases
index 1aedbba..8599ac6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsHardwareTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsHardwareTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsHardwareTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsHardwareTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsHardwareTestCases',
+        tag='internal.x86.CtsHardwareTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsHarmfulAppWarningHostTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHarmfulAppWarningHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsHarmfulAppWarningHostTestCases
index 9fa6de0..1ba964c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsHarmfulAppWarningHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsHarmfulAppWarningHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsHarmfulAppWarningHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsHarmfulAppWarningHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsHarmfulAppWarningHostTestCases',
+        tag='internal.x86.CtsHarmfulAppWarningHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHiddenApi b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsHiddenApi
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHiddenApi
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsHiddenApi
index 89639f7..392bc5a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHiddenApi
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsHiddenApi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsHiddenApi'
+NAME = 'cheets_CTS_P.internal.x86.CtsHiddenApi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsHiddenApi',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsHiddenApi',
+        tag='internal.x86.CtsHiddenApi',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=12600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsHostTzDataTests
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostTzDataTests
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsHostTzDataTests
index 09ea273..1a2a511 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsHostTzDataTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsHostTzDataTests'
+NAME = 'cheets_CTS_P.internal.x86.CtsHostTzDataTests'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsHostTzDataTests',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsHostTzDataTests',
+        tag='internal.x86.CtsHostTzDataTests',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostside b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsHostside
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostside
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsHostside
index 3f324b1..25d0d6c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostside
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsHostside
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsHostside'
+NAME = 'cheets_CTS_P.internal.x86.CtsHostside'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsHostside',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsHostside',
+        tag='internal.x86.CtsHostside',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsIcuTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIcuTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsIcuTestCases
index 6e33fcd..3377d14 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsIcuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsIcuTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsIcuTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsIcuTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsIcuTestCases',
+        tag='internal.x86.CtsIcuTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsIncidentHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIncidentHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsIncidentHostTestCases
index ca65be0..7090136 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsIncidentHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsIncidentHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsIncidentHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsIncidentHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsIncidentHostTestCases',
+        tag='internal.x86.CtsIncidentHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsInlineMockingTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInlineMockingTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsInlineMockingTestCases
index 92660a7..b66d224 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsInlineMockingTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsInlineMockingTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsInlineMockingTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsInlineMockingTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsInlineMockingTestCases',
+        tag='internal.x86.CtsInlineMockingTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInputMethod b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsInputMethod
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInputMethod
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsInputMethod
index e02575e..a1a531c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInputMethod
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsInputMethod
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsInputMethod'
+NAME = 'cheets_CTS_P.internal.x86.CtsInputMethod'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsInputMethod',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsInputMethod',
+        tag='internal.x86.CtsInputMethod',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIntentSignatureTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsIntentSignatureTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIntentSignatureTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsIntentSignatureTestCases
index 837d77d..a253a55 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIntentSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsIntentSignatureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsIntentSignatureTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsIntentSignatureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsIntentSignatureTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsIntentSignatureTestCases',
+        tag='internal.x86.CtsIntentSignatureTestCases',
+        test_name='cheets_CTS_P.internal.x86.CtsIntentSignatureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIntentSignatureTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsIntentSignatureTestCases',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsJankDeviceTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJankDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsJankDeviceTestCases
index 10462bb..f3c8898 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsJankDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsJankDeviceTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsJankDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsJankDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsJankDeviceTestCases',
+        tag='internal.x86.CtsJankDeviceTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJdwp b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsJdwp
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJdwp
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsJdwp
index 0c9e979..0b3e9e0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJdwp
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsJdwp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsJdwp'
+NAME = 'cheets_CTS_P.internal.x86.CtsJdwp'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsJdwp',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsJdwp',
+        tag='internal.x86.CtsJdwp',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsJniTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJniTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsJniTestCases
index 824a3c1..b6bf4b1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsJniTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsJniTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsJniTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsJniTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsJniTestCases',
+        tag='internal.x86.CtsJniTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJobScheduler b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsJobScheduler
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJobScheduler
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsJobScheduler
index be974bb..2406e70 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJobScheduler
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsJobScheduler
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsJobScheduler'
+NAME = 'cheets_CTS_P.internal.x86.CtsJobScheduler'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsJobScheduler',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsJobScheduler',
+        tag='internal.x86.CtsJobScheduler',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=5400)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJvmti b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsJvmti
similarity index 98%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJvmti
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsJvmti
index 6103107..97da910 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJvmti
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsJvmti
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsJvmti'
+NAME = 'cheets_CTS_P.internal.x86.CtsJvmti'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsJvmti',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsJvmti',
+        tag='internal.x86.CtsJvmti',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=26700)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsKernelConfigTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKernelConfigTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsKernelConfigTestCases
index 1e6a94c..eaa6d74 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsKernelConfigTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsKernelConfigTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsKernelConfigTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsKernelConfigTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsKernelConfigTestCases',
+        tag='internal.x86.CtsKernelConfigTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsKeystoreTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKeystoreTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsKeystoreTestCases
index 06d1c32..83dc9f2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsKeystoreTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsKeystoreTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsKeystoreTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsKeystoreTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsKeystoreTestCases',
+        tag='internal.x86.CtsKeystoreTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsLeanbackJankTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLeanbackJankTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsLeanbackJankTestCases
index d59d218..4359d2b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsLeanbackJankTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsLeanbackJankTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsLeanbackJankTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsLeanbackJankTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsLeanbackJankTestCases',
+        tag='internal.x86.CtsLeanbackJankTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLegacyNotificationTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsLegacyNotificationTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLegacyNotificationTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsLegacyNotificationTestCases
index e2814f9..8aeed34 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLegacyNotificationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsLegacyNotificationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsLegacyNotificationTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsLegacyNotificationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsLegacyNotificationTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsLegacyNotificationTestCases',
+        tag='internal.x86.CtsLegacyNotificationTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLibcore b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsLibcore
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLibcore
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsLibcore
index b3284b0..a230f2f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLibcore
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsLibcore
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsLibcore'
+NAME = 'cheets_CTS_P.internal.x86.CtsLibcore'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsLibcore',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsLibcore',
+        tag='internal.x86.CtsLibcore',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=21600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsLiblogTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLiblogTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsLiblogTestCases
index 14b2667..fefae68 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsLiblogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsLiblogTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsLiblogTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsLiblogTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsLiblogTestCases',
+        tag='internal.x86.CtsLiblogTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLocation b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsLocation
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLocation
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsLocation
index 8867067..f413426 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLocation
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsLocation
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsLocation'
+NAME = 'cheets_CTS_P.internal.x86.CtsLocation'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsLocation',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsLocation',
+        tag='internal.x86.CtsLocation',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsLogdTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLogdTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsLogdTestCases
index 96ae523..b61db1d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsLogdTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsLogdTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsLogdTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsLogdTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsLogdTestCases',
+        tag='internal.x86.CtsLogdTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaBitstreamsTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaBitstreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaBitstreamsTestCases
index 4d3a639..137d30c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaBitstreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaBitstreamsTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsMediaBitstreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.x86.CtsMediaBitstreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaBitstreamsTestCases',
+        tag='internal.x86.CtsMediaBitstreamsTestCases',
+        test_name='cheets_CTS_P.internal.x86.CtsMediaBitstreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaBitstreamsTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaBitstreamsTestCases',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaHostTestCases
index 5898d26..fd83ff3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsMediaHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsMediaHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaHostTestCases',
+        tag='internal.x86.CtsMediaHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaStressTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaStressTestCases
index 54c9ebe..9b348e3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaStressTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaStressTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsMediaStressTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.x86.CtsMediaStressTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaStressTestCases',
+        tag='internal.x86.CtsMediaStressTestCases',
+        test_name='cheets_CTS_P.internal.x86.CtsMediaStressTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaStressTestCases',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         precondition_commands=['cras_test_client --mute 1'],
         timeout=18000)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaStressTestCases.camera.ctshardware
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaStressTestCases.camera.ctshardware
index 5fd8db7..9fa5652 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaStressTestCases.camera.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsMediaStressTestCases.camera.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware',
+        tag='internal.x86.CtsMediaStressTestCases.camera.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsMediaStressTestCases.camera.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases android.mediastress.cts.MediaRecorderStressTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaStressTestCases.camera',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.32 b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.32
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.32
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.32
index f9d4a2a..13f2c67 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.CtsMediaTestCases.32'
+NAME = 'cheets_CTS_P.internal.x86.CtsMediaTestCases.32'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.x86.CtsMediaTestCases.32',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.32',
+        tag='internal.x86.CtsMediaTestCases.32',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         precondition_commands=['cras_test_client --mute 1'],
         timeout=36000)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.64 b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.64
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.64
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.64
index f649338..e0901b3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.CtsMediaTestCases.64'
+NAME = 'cheets_CTS_P.internal.x86.CtsMediaTestCases.64'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.x86.CtsMediaTestCases.64',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.64',
+        tag='internal.x86.CtsMediaTestCases.64',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         precondition_commands=['cras_test_client --mute 1'],
         timeout=36000)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.DecodeAccuracyTest
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.DecodeAccuracyTest
index 293799f..53a3062 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.DecodeAccuracyTest
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest'
+NAME = 'cheets_CTS_P.internal.x86.CtsMediaTestCases.DecodeAccuracyTest'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest',
+        tag='internal.x86.CtsMediaTestCases.DecodeAccuracyTest',
+        test_name='cheets_CTS_P.internal.x86.CtsMediaTestCases.DecodeAccuracyTest',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
index da11485..08e77f0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware',
+        tag='internal.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
index e4b8088..12f6d45 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest'
+NAME = 'cheets_CTS_P.internal.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest',
+        tag='internal.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest',
+        test_name='cheets_CTS_P.internal.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--include-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
similarity index 81%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
index e5b338b..d3364de 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware',
+        tag='internal.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--include-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.audio b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.audio
similarity index 94%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.audio
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.audio
index ff342a4..87ed4d1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.audio
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.CtsMediaTestCases.audio'
+NAME = 'cheets_CTS_P.internal.x86.CtsMediaTestCases.audio'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.x86.CtsMediaTestCases.audio',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.audio',
+        tag='internal.x86.CtsMediaTestCases.audio',
+        test_name='cheets_CTS_P.internal.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_r17.x86.CtsMediaTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.ctshardware
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.ctshardware
index c23b7e5..fab7644 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsMediaTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.x86.CtsMediaTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.ctshardware',
+        tag='internal.x86.CtsMediaTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsMediaTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.other
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.other
index a3ac271..e26dcc6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.other
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.other'
+NAME = 'cheets_CTS_P.internal.x86.CtsMediaTestCases.other'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r17.x86.CtsMediaTestCases.other',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.other',
+        tag='internal.x86.CtsMediaTestCases.other',
+        test_name='cheets_CTS_P.internal.x86.CtsMediaTestCases.other',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.other.ctshardware
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.other.ctshardware
index 58ab66f..cb8e368 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMediaTestCases.other.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.other.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsMediaTestCases.other.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r17.x86.CtsMediaTestCases.other.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.other.ctshardware',
+        tag='internal.x86.CtsMediaTestCases.other.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsMediaTestCases.other.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMidiTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMidiTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMidiTestCases
index 2c8f548..e13cf5c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMidiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMidiTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsMidiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsMidiTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMidiTestCases',
+        tag='internal.x86.CtsMidiTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMocking b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMocking
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMocking
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMocking
index 76ce800..7192543 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMocking
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMocking
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMocking'
+NAME = 'cheets_CTS_P.internal.x86.CtsMocking'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsMocking',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMocking',
+        tag='internal.x86.CtsMocking',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMonkeyTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMonkeyTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMonkeyTestCases
index 88fe62e..12f9883 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMonkeyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMonkeyTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsMonkeyTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsMonkeyTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMonkeyTestCases',
+        tag='internal.x86.CtsMonkeyTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMultiUser b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMultiUser
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMultiUser
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsMultiUser
index 30f74fa..86ef9c6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMultiUser
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsMultiUser
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsMultiUser'
+NAME = 'cheets_CTS_P.internal.x86.CtsMultiUser'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsMultiUser',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsMultiUser',
+        tag='internal.x86.CtsMultiUser',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsNNAPITestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNNAPITestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsNNAPITestCases
index b5a9035..348a5a7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsNNAPITestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsNNAPITestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsNNAPITestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsNNAPITestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsNNAPITestCases',
+        tag='internal.x86.CtsNNAPITestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNative b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsNative
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNative
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsNative
index b579c9e..993da3f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNative
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsNative
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsNative'
+NAME = 'cheets_CTS_P.internal.x86.CtsNative'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsNative',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsNative',
+        tag='internal.x86.CtsNative',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsNativeMediaAAudioTestCases.ctshardware
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsNativeMediaAAudioTestCases.ctshardware
index 4c9557e..b090866 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsNativeMediaAAudioTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsNativeMediaAAudioTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware',
+        tag='internal.x86.CtsNativeMediaAAudioTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsNativeMediaAAudioTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNativeMediaAAudioTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsNdefTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNdefTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsNdefTestCases
index 22c13b8..0e6c2c2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsNdefTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsNdefTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsNdefTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsNdefTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsNdefTestCases',
+        tag='internal.x86.CtsNdefTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNet b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsNet
similarity index 94%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNet
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsNet
index d1cd06a..48b9feb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNet
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsNet
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsNet'
+NAME = 'cheets_CTS_P.internal.x86.CtsNet'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsNet',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsNet',
+        tag='internal.x86.CtsNet',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         precondition_commands=['android-sh -c \'setprop ctl.start mdnsd\''],
         timeout=30600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNetTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsNetTestCases.ctshardware
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNetTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsNetTestCases.ctshardware
index 7fc4684..1f27261 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNetTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsNetTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsNetTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsNetTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsNetTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsNetTestCases.ctshardware',
+        tag='internal.x86.CtsNetTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsNetTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNetTestCases',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsOmapiTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOmapiTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsOmapiTestCases
index 9b4c3e4..c8f5b1b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsOmapiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsOmapiTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsOmapiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsOmapiTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsOmapiTestCases',
+        tag='internal.x86.CtsOmapiTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOpenG b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsOpenG
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOpenG
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsOpenG
index 0d15737..cdf3f0d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOpenG
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsOpenG
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsOpenG'
+NAME = 'cheets_CTS_P.internal.x86.CtsOpenG'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsOpenG',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsOpenG',
+        tag='internal.x86.CtsOpenG',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOs b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsOs
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOs
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsOs
index 5ae2bf1..f9fc32d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOs
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsOs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsOs'
+NAME = 'cheets_CTS_P.internal.x86.CtsOs'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsOs',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsOs',
+        tag='internal.x86.CtsOs',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=5400)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsPdfTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPdfTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsPdfTestCases
index c6eb4dc..ef2678c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsPdfTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsPdfTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsPdfTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsPdfTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsPdfTestCases',
+        tag='internal.x86.CtsPdfTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsPerfettoTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsPerfettoTestCases
index e8b2c0f..48d324b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsPerfettoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsPerfettoTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsPerfettoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsPerfettoTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsPerfettoTestCases',
+        tag='internal.x86.CtsPerfettoTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsPerfettoTestCases.ctshardware
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsPerfettoTestCases.ctshardware
index 67ef993..bd7cbe8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsPerfettoTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsPerfettoTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsPerfettoTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsPerfettoTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsPerfettoTestCases.ctshardware',
+        tag='internal.x86.CtsPerfettoTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsPerfettoTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', '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_r17.x86.CtsPermission b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsPermission
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermission
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsPermission
index b4b7926..e6c9477 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermission
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsPermission'
+NAME = 'cheets_CTS_P.internal.x86.CtsPermission'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsPermission',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsPermission',
+        tag='internal.x86.CtsPermission',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermissionTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsPermissionTestCases.camera.ctshardware
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermissionTestCases.camera.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsPermissionTestCases.camera.ctshardware
index cf7b926..6a03207 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermissionTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsPermissionTestCases.camera.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsPermissionTestCases.camera.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsPermissionTestCases.camera.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsPermissionTestCases.camera.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsPermissionTestCases.camera.ctshardware',
+        tag='internal.x86.CtsPermissionTestCases.camera.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsPermissionTestCases.camera.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermissionTestCases android.permission.cts.CameraPermissionTest', '--include-filter', 'CtsPermissionTestCases android.permission.cts.Camera2PermissionTest', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPermissionTestCases.camera',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPreference b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsPreference
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPreference
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsPreference
index 5fc6f8a..be95b92 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPreference
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsPreference
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsPreference'
+NAME = 'cheets_CTS_P.internal.x86.CtsPreference'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsPreference',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsPreference',
+        tag='internal.x86.CtsPreference',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsPrintTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPrintTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsPrintTestCases
index afb253d..e47d06b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsPrintTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsPrintTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsPrintTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsPrintTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsPrintTestCases',
+        tag='internal.x86.CtsPrintTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsProtoTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProtoTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsProtoTestCases
index 7fe0fe8..5be712f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsProtoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsProtoTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsProtoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsProtoTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsProtoTestCases',
+        tag='internal.x86.CtsProtoTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsProviderTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProviderTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsProviderTestCases
index 5e79cf9..a1bdd18 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsProviderTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsProviderTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsProviderTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsProviderTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsProviderTestCases',
+        tag='internal.x86.CtsProviderTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRenderscript b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsRenderscript
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRenderscript
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsRenderscript
index e97ff1c..709f511 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRenderscript
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsRenderscript
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsRenderscript'
+NAME = 'cheets_CTS_P.internal.x86.CtsRenderscript'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsRenderscript',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsRenderscript',
+        tag='internal.x86.CtsRenderscript',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRs b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsRs
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRs
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsRs
index d5cee33..827c462 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRs
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsRs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsRs'
+NAME = 'cheets_CTS_P.internal.x86.CtsRs'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsRs',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsRs',
+        tag='internal.x86.CtsRs',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSample b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSample
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSample
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSample
index 379682e..39cfaa4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSample
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSample
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSample'
+NAME = 'cheets_CTS_P.internal.x86.CtsSample'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSample',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSample',
+        tag='internal.x86.CtsSample',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSaxTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSaxTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSaxTestCases
index b69000c..d1ea1b4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSaxTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSaxTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsSaxTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSaxTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSaxTestCases',
+        tag='internal.x86.CtsSaxTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSeccompHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSeccompHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSeccompHostTestCases
index 6fe4bf5..ff31a0b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSeccompHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSeccompHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsSeccompHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSeccompHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSeccompHostTestCases',
+        tag='internal.x86.CtsSeccompHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSecureElementAccessControl
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecureElementAccessControl
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSecureElementAccessControl
index 6c77a93..d504721 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSecureElementAccessControl
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSecureElementAccessControl'
+NAME = 'cheets_CTS_P.internal.x86.CtsSecureElementAccessControl'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSecureElementAccessControl',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSecureElementAccessControl',
+        tag='internal.x86.CtsSecureElementAccessControl',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecurity b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSecurity
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecurity
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSecurity
index d6dfb37..e4fe351 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecurity
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSecurity
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSecurity'
+NAME = 'cheets_CTS_P.internal.x86.CtsSecurity'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSecurity',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSecurity',
+        tag='internal.x86.CtsSecurity',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid', 'modprobe configs'],
         timeout=12600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSelinuxTargetSdk b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSelinuxTargetSdk
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSelinuxTargetSdk
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSelinuxTargetSdk
index a138de9..8764012 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSelinuxTargetSdk
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSelinuxTargetSdk
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSelinuxTargetSdk'
+NAME = 'cheets_CTS_P.internal.x86.CtsSelinuxTargetSdk'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSelinuxTargetSdk',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSelinuxTargetSdk',
+        tag='internal.x86.CtsSelinuxTargetSdk',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSensorTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSensorTestCases
index 2f1c86d..20e0d7d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSensorTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSensorTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsSensorTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r17.x86.CtsSensorTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSensorTestCases',
+        tag='internal.x86.CtsSensorTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSensorTestCases.ctshardware
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSensorTestCases.ctshardware
index 2c6c544..f33164c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSensorTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSensorTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsSensorTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r17.x86.CtsSensorTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSensorTestCases.ctshardware',
+        tag='internal.x86.CtsSensorTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsSensorTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', '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_r17.x86.CtsShortcut b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsShortcut
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsShortcut
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsShortcut
index 3e9d6bf..2a0fdde 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsShortcut
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsShortcut
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsShortcut'
+NAME = 'cheets_CTS_P.internal.x86.CtsShortcut'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsShortcut',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsShortcut',
+        tag='internal.x86.CtsShortcut',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimRestrictedApisTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSimRestrictedApisTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimRestrictedApisTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSimRestrictedApisTestCases
index 995305b..b2759f8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimRestrictedApisTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSimRestrictedApisTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSimRestrictedApisTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsSimRestrictedApisTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSimRestrictedApisTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSimRestrictedApisTestCases',
+        tag='internal.x86.CtsSimRestrictedApisTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSimpleCpuTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleCpuTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSimpleCpuTestCases
index c89a043..cd528e5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSimpleCpuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSimpleCpuTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsSimpleCpuTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSimpleCpuTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSimpleCpuTestCases',
+        tag='internal.x86.CtsSimpleCpuTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSimpleperfTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleperfTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSimpleperfTestCases
index f99eafd..10e65e1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSimpleperfTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSimpleperfTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsSimpleperfTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSimpleperfTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSimpleperfTestCases',
+        tag='internal.x86.CtsSimpleperfTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSkQPTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSkQPTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSkQPTestCases
index e9327de..69060f1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSkQPTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSkQPTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsSkQPTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSkQPTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSkQPTestCases',
+        tag='internal.x86.CtsSkQPTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSliceTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSliceTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSliceTestCases
index 945029d..6f1e3a2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSliceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSliceTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsSliceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSliceTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSliceTestCases',
+        tag='internal.x86.CtsSliceTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSpeechTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSpeechTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSpeechTestCases
index 500a2fd..4f51e9b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSpeechTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSpeechTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsSpeechTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSpeechTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSpeechTestCases',
+        tag='internal.x86.CtsSpeechTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsStatsdHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsStatsdHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsStatsdHostTestCases
index 7d0d941..53d78c5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsStatsdHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsStatsdHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsStatsdHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsStatsdHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsStatsdHostTestCases',
+        tag='internal.x86.CtsStatsdHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         prerequisites=['bluetooth'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSustainedPerformanceHostTestCases
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSustainedPerformanceHostTestCases
index 2a39d43..1593216 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSustainedPerformanceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSustainedPerformanceHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsSustainedPerformanceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSustainedPerformanceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSustainedPerformanceHostTestCases',
+        tag='internal.x86.CtsSustainedPerformanceHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSustainedPerformanceHostTestCases.ctshardware
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSustainedPerformanceHostTestCases.ctshardware
index ae58b94..43e8dad 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSustainedPerformanceHostTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsSustainedPerformanceHostTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware',
+        tag='internal.x86.CtsSustainedPerformanceHostTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsSustainedPerformanceHostTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', '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_r17.x86.CtsSync b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSync
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSync
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSync
index 1d41152..4fc7c5d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSync
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSync
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSync'
+NAME = 'cheets_CTS_P.internal.x86.CtsSync'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSync',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSync',
+        tag='internal.x86.CtsSync',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSystem b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSystem
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSystem
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsSystem
index c00a322..e051f4e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSystem
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsSystem
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsSystem'
+NAME = 'cheets_CTS_P.internal.x86.CtsSystem'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsSystem',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsSystem',
+        tag='internal.x86.CtsSystem',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelecom b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsTelecom
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelecom
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsTelecom
index 4b0e030..82cb8ff 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelecom
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsTelecom
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsTelecom'
+NAME = 'cheets_CTS_P.internal.x86.CtsTelecom'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsTelecom',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsTelecom',
+        tag='internal.x86.CtsTelecom',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelephony b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsTelephony
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelephony
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsTelephony
index 59c13ff..18f8a24 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelephony
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsTelephony
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsTelephony'
+NAME = 'cheets_CTS_P.internal.x86.CtsTelephony'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsTelephony',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsTelephony',
+        tag='internal.x86.CtsTelephony',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsTextTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTextTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsTextTestCases
index e2ed1f2..c737ee4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsTextTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsTextTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsTextTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsTextTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsTextTestCases',
+        tag='internal.x86.CtsTextTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTheme b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsTheme
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTheme
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsTheme
index 2f37fc2..fae4a9e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTheme
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsTheme
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsTheme'
+NAME = 'cheets_CTS_P.internal.x86.CtsTheme'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,15 +21,15 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsTheme',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsTheme',
+        tag='internal.x86.CtsTheme',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
         extra_artifacts_host=['/tmp/diff_*.png'],
-        uri='LATEST',
+        uri='DEV',
         prerequisites=['region_us'],
         timeout=5400)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsToast b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsToast
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsToast
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsToast
index e6bd376..c39f8ef 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsToast
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsToast
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsToast'
+NAME = 'cheets_CTS_P.internal.x86.CtsToast'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsToast',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsToast',
+        tag='internal.x86.CtsToast',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsTransitionTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTransitionTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsTransitionTestCases
index 9d4862b..3092fb8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsTransitionTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsTransitionTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsTransitionTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsTransitionTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsTransitionTestCases',
+        tag='internal.x86.CtsTransitionTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsTrustedVoiceHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTrustedVoiceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsTrustedVoiceHostTestCases
index b09d641..872d8db 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsTrustedVoiceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsTrustedVoiceHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsTrustedVoiceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsTrustedVoiceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsTrustedVoiceHostTestCases',
+        tag='internal.x86.CtsTrustedVoiceHostTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTv b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsTv
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTv
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsTv
index aa0de74..1eda6a6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTv
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsTv
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsTv'
+NAME = 'cheets_CTS_P.internal.x86.CtsTv'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsTv',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsTv',
+        tag='internal.x86.CtsTv',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUi b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsUi
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUi
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsUi
index 4ea833a..e1e5d4b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUi
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsUi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsUi'
+NAME = 'cheets_CTS_P.internal.x86.CtsUi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsUi',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsUi',
+        tag='internal.x86.CtsUi',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsUidIsolationTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUidIsolationTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsUidIsolationTestCases
index 219df2d..07ae77f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsUidIsolationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsUidIsolationTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsUidIsolationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsUidIsolationTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsUidIsolationTestCases',
+        tag='internal.x86.CtsUidIsolationTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsUsageStatsTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsUsageStatsTestCases
index ed9a413..75f995d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsUsageStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsUsageStatsTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsUsageStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsUsageStatsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsUsageStatsTestCases',
+        tag='internal.x86.CtsUsageStatsTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsUsageStatsTestCases.ctshardware
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsUsageStatsTestCases.ctshardware
index aa99ebb..96a26ce 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsUsageStatsTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsUsageStatsTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsUsageStatsTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsUsageStatsTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsUsageStatsTestCases.ctshardware',
+        tag='internal.x86.CtsUsageStatsTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsUsageStatsTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', '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_r17.x86.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsUsbTests
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsbTests
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsUsbTests
index 5ece5e0..30c3646 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsUsbTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsUsbTests'
+NAME = 'cheets_CTS_P.internal.x86.CtsUsbTests'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsUsbTests',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsUsbTests',
+        tag='internal.x86.CtsUsbTests',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsUtilTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUtilTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsUtilTestCases
index 69bd155..2432afb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsUtilTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsUtilTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsUtilTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsUtilTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsUtilTestCases',
+        tag='internal.x86.CtsUtilTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsVideoTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVideoTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsVideoTestCases
index 5806ce6..4e3d758 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsVideoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsVideoTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsVideoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsVideoTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsVideoTestCases',
+        tag='internal.x86.CtsVideoTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.32 b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsViewTestCases.32
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.32
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsViewTestCases.32
index 1885c8c..378d3d1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsViewTestCases.32
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsViewTestCases.32'
+NAME = 'cheets_CTS_P.internal.x86.CtsViewTestCases.32'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,15 +21,15 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsViewTestCases.32',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsViewTestCases.32',
+        tag='internal.x86.CtsViewTestCases.32',
+        test_name='cheets_CTS_P.internal.x86.CtsViewTestCases.32',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--abi', 'x86', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsViewTestCases',
         target_plan=None,
         bundle='x86',
         extra_artifacts=['/storage/emulated/0/SurfaceViewSyncTest/'],
-        uri='LATEST',
+        uri='DEV',
         precondition_commands=['sleep 60'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.64 b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsViewTestCases.64
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.64
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsViewTestCases.64
index 829429e..69b0713 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsViewTestCases.64
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsViewTestCases.64'
+NAME = 'cheets_CTS_P.internal.x86.CtsViewTestCases.64'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,15 +21,15 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsViewTestCases.64',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsViewTestCases.64',
+        tag='internal.x86.CtsViewTestCases.64',
+        test_name='cheets_CTS_P.internal.x86.CtsViewTestCases.64',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--abi', 'x86_64', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsViewTestCases',
         target_plan=None,
         bundle='x86',
         extra_artifacts=['/storage/emulated/0/SurfaceViewSyncTest/'],
-        uri='LATEST',
+        uri='DEV',
         precondition_commands=['sleep 60'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsViewTestCases.ctshardware
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.ctshardware
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsViewTestCases.ctshardware
index b39256a..40f9bbd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsViewTestCases.ctshardware
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsViewTestCases.ctshardware'
+NAME = 'cheets_CTS_P.internal.x86.CtsViewTestCases.ctshardware'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsViewTestCases.ctshardware',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsViewTestCases.ctshardware',
+        tag='internal.x86.CtsViewTestCases.ctshardware',
+        test_name='cheets_CTS_P.internal.x86.CtsViewTestCases.ctshardware',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', '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_r17.x86.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsVmTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVmTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsVmTestCases
index daaf1e9..8404189 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsVmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsVmTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsVmTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsVmTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsVmTestCases',
+        tag='internal.x86.CtsVmTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVoice b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsVoice
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVoice
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsVoice
index b6e7d73..e138b84 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVoice
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsVoice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsVoice'
+NAME = 'cheets_CTS_P.internal.x86.CtsVoice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsVoice',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsVoice',
+        tag='internal.x86.CtsVoice',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsVrTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVrTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsVrTestCases
index e7d1429..d5a59e9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsVrTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsVrTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsVrTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsVrTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsVrTestCases',
+        tag='internal.x86.CtsVrTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsWebkitTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWebkitTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsWebkitTestCases
index a71ba6e..7109266 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsWebkitTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsWebkitTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsWebkitTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsWebkitTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsWebkitTestCases',
+        tag='internal.x86.CtsWebkitTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         prerequisites=['region_us'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsWidgetTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWidgetTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsWidgetTestCases
index b58b3c3..7c01ea1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsWidgetTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsWidgetTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsWidgetTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsWidgetTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsWidgetTestCases',
+        tag='internal.x86.CtsWidgetTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsWindowManagerDeviceTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWindowManagerDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsWindowManagerDeviceTestCases
index adb380b..1447c79 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsWindowManagerDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsWindowManagerDeviceTestCases'
+NAME = 'cheets_CTS_P.internal.x86.CtsWindowManagerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsWindowManagerDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsWindowManagerDeviceTestCases',
+        tag='internal.x86.CtsWindowManagerDeviceTestCases',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWrap b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsWrap
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWrap
rename to server/site_tests/cheets_CTS_P/control.internal.x86.CtsWrap
index b4b2693..21b887f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWrap
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.CtsWrap
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.CtsWrap'
+NAME = 'cheets_CTS_P.internal.x86.CtsWrap'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.CtsWrap',
-        test_name='cheets_CTS_P.9.0_r17.x86.CtsWrap',
+        tag='internal.x86.CtsWrap',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
similarity index 81%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
index 378f0bd..da98f83 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
+        tag='internal.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
similarity index 78%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
index 8071655..51f121d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
+        tag='internal.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
similarity index 81%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
index e752dce..55ab724 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
+        tag='internal.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
similarity index 79%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
index f00906e..bd19e82 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
+        tag='internal.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
similarity index 93%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
index 97d5615..751835e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         enable_default_apps=True,
-        tag='9.0_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
+        tag='internal.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
index 14c6889..47cfdeb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
+        tag='internal.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
index e48ad11..1b410c6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
+        tag='internal.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
index 57715a8..77bd784 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
+        tag='internal.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
similarity index 81%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
index 61dcfac..1c7eaa5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        tag='internal.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
similarity index 92%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
index 8371fc4..9f02bc4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
+        tag='internal.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
similarity index 97%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
index e54a18f..608b677 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
+        tag='internal.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
similarity index 79%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
index f4810a6..4121325 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
+        tag='internal.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
similarity index 81%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
index ada8846..a5e2042 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
+        tag='internal.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
similarity index 81%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
index 685b3dd..f9ba811 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
+        tag='internal.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32 b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32
index 7dfe923..9a724b9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32',
+        tag='internal.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64 b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64
index 6f9cc3c..dcc0056 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -23,8 +23,8 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64',
+        tag='internal.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
similarity index 95%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
index 7159b77..3a05f5b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
+        tag='internal.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
index 0511461..bab6568 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
+        tag='internal.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
similarity index 83%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
index 2d82aae..1e60b62 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
+        tag='internal.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
similarity index 82%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
index 576820a..fb7746c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsSensorTestCases_-_CtsSensorTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
+        tag='internal.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
similarity index 93%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
index 5836c07..8ba3b3f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
+        tag='internal.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
+        test_name='cheets_CTS_P.internal.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_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.32 b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsViewTestCases_-_CtsViewTestCases.32
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.32
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsViewTestCases_-_CtsViewTestCases.32
index 4406f3a..1129432 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsViewTestCases_-_CtsViewTestCases.32
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.32'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsViewTestCases_-_CtsViewTestCases.32'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.32',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.32',
+        tag='internal.x86.all.CtsViewTestCases_-_CtsViewTestCases.32',
+        test_name='cheets_CTS_P.internal.x86.all.CtsViewTestCases_-_CtsViewTestCases.32',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--abi', 'x86', '--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_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.64 b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsViewTestCases_-_CtsViewTestCases.64
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.64
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsViewTestCases_-_CtsViewTestCases.64
index c9e22fb..44ec003 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsViewTestCases_-_CtsViewTestCases.64
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.64'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsViewTestCases_-_CtsViewTestCases.64'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.64',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.64',
+        tag='internal.x86.all.CtsViewTestCases_-_CtsViewTestCases.64',
+        test_name='cheets_CTS_P.internal.x86.all.CtsViewTestCases_-_CtsViewTestCases.64',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--abi', 'x86_64', '--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_r17.x86.all.CtsVmTestCases_-_vm-tests-tf b/server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsVmTestCases_-_vm-tests-tf
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsVmTestCases_-_vm-tests-tf
rename to server/site_tests/cheets_CTS_P/control.internal.x86.all.CtsVmTestCases_-_vm-tests-tf
index 6171771..825f00d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsVmTestCases_-_vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.all.CtsVmTestCases_-_vm-tests-tf'
+NAME = 'cheets_CTS_P.internal.x86.all.CtsVmTestCases_-_vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,8 +22,8 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r17.x86.all.CtsVmTestCases_-_vm-tests-tf',
-        test_name='cheets_CTS_P.9.0_r17.x86.all.CtsVmTestCases_-_vm-tests-tf',
+        tag='internal.x86.all.CtsVmTestCases_-_vm-tests-tf',
+        test_name='cheets_CTS_P.internal.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_r17.x86.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.internal.x86.cts-system-all.api
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.cts-system-all.api
rename to server/site_tests/cheets_CTS_P/control.internal.x86.cts-system-all.api
index 841fb1e..776667e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.cts-system-all.api'
+NAME = 'cheets_CTS_P.internal.x86.cts-system-all.api'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.cts-system-all.api',
-        test_name='cheets_CTS_P.9.0_r17.x86.cts-system-all.api',
+        tag='internal.x86.cts-system-all.api',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.signed-CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.internal.x86.signed-CtsSecureElementAccessControl
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.signed-CtsSecureElementAccessControl
rename to server/site_tests/cheets_CTS_P/control.internal.x86.signed-CtsSecureElementAccessControl
index 9b7797c..e337df3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.signed-CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.signed-CtsSecureElementAccessControl'
+NAME = 'cheets_CTS_P.internal.x86.signed-CtsSecureElementAccessControl'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.signed-CtsSecureElementAccessControl',
-        test_name='cheets_CTS_P.9.0_r17.x86.signed-CtsSecureElementAccessControl',
+        tag='internal.x86.signed-CtsSecureElementAccessControl',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.tradefed-run-collect-tests-only-hardware-internal b/server/site_tests/cheets_CTS_P/control.internal.x86.tradefed-run-collect-tests-only-hardware-internal
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.tradefed-run-collect-tests-only-hardware-internal
rename to server/site_tests/cheets_CTS_P/control.internal.x86.tradefed-run-collect-tests-only-hardware-internal
index d58e930..90ea625 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.tradefed-run-collect-tests-only-hardware-internal
+++ b/server/site_tests/cheets_CTS_P/control.internal.x86.tradefed-run-collect-tests-only-hardware-internal
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r17.x86.tradefed-run-collect-tests-only-hardware-internal'
+NAME = 'cheets_CTS_P.internal.x86.tradefed-run-collect-tests-only-hardware-internal'
 ATTRIBUTES = 'suite:arc-cts-hardware'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.tradefed-run-collect-tests-only-hardware-internal',
-        test_name='cheets_CTS_P.9.0_r17.x86.tradefed-run-collect-tests-only-hardware-internal',
+        tag='internal.x86.tradefed-run-collect-tests-only-hardware-internal',
+        test_name='cheets_CTS_P.internal.x86.tradefed-run-collect-tests-only-hardware-internal',
         run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--subplan', 'cts-hardware', '--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=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='tradefed-run-collect-tests-only-hardware-internal',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.internal.x86.vm-tests-tf
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.vm-tests-tf
rename to server/site_tests/cheets_CTS_P/control.internal.x86.vm-tests-tf
index ed67e5c..5a94040 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.vm-tests-tf'
+NAME = 'cheets_CTS_P.internal.x86.vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.vm-tests-tf',
-        test_name='cheets_CTS_P.9.0_r17.x86.vm-tests-tf',
+        tag='internal.x86.vm-tests-tf',
+        test_name='cheets_CTS_P.internal.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',
         target_plan=None,
         bundle='x86',
-        uri='LATEST',
+        uri='DEV',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.wm-presubmit b/server/site_tests/cheets_CTS_P/control.internal.x86.wm-presubmit
similarity index 92%
rename from server/site_tests/cheets_CTS_P/control.9.0_r17.x86.wm-presubmit
rename to server/site_tests/cheets_CTS_P/control.internal.x86.wm-presubmit
index 0e1a93d..2240e2e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.wm-presubmit
+++ b/server/site_tests/cheets_CTS_P/control.internal.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_r17.x86.wm-presubmit'
+NAME = 'cheets_CTS_P.internal.x86.wm-presubmit'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,8 +21,8 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r17.x86.wm-presubmit',
-        test_name='cheets_CTS_P.9.0_r17.x86.wm-presubmit',
+        tag='internal.x86.wm-presubmit',
+        test_name='cheets_CTS_P.internal.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',